Diff
Modified: trunk/LayoutTests/ChangeLog (213420 => 213421)
--- trunk/LayoutTests/ChangeLog 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/LayoutTests/ChangeLog 2017-03-04 08:57:56 UTC (rev 213421)
@@ -1,3 +1,22 @@
+2017-03-04 Nikita Vasilyev <nvasil...@apple.com>
+
+ Web Inspector: Show Web Socket connections in Network tab
+ https://bugs.webkit.org/show_bug.cgi?id=167520
+
+ Reviewed by Joseph Pecoraro.
+
+ * http/tests/websocket/tests/hybi/inspector/client-close-expected.txt: Added.
+ * http/tests/websocket/tests/hybi/inspector/client-close.html: Added.
+ * http/tests/websocket/tests/hybi/inspector/client-close_wsh.py: Added.
+ (web_socket_do_extra_handshake):
+ (web_socket_transfer_data):
+ * http/tests/websocket/tests/hybi/inspector/server-close-expected.txt: Added.
+ * http/tests/websocket/tests/hybi/inspector/server-close.html: Added.
+ * http/tests/websocket/tests/hybi/inspector/server-close_wsh.py: Added.
+ (web_socket_do_extra_handshake):
+ (web_socket_transfer_data):
+ * platform/ios-simulator/TestExpectations:
+
2017-03-03 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r213400.
Added: trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close-expected.txt (0 => 213421)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close-expected.txt 2017-03-04 08:57:56 UTC (rev 213421)
@@ -0,0 +1,15 @@
+Tests WebSockets connection closed by the client.
+
+
+== Running test suite: WebSocket.ClientClose
+-- Running test case: WebSocket.ClientClose
+PASS: WebSocketResource should be created.
+PASS: WebSocketResource should be a WebSocket type.
+PASS: WebSocketResource should be in a Connecting state.
+PASS: WebSocketResource previous state should be Connecting.
+PASS: WebSocketResource state should change to Open.
+PASS: WebSocketResource should be in a Open state.
+PASS: WebSocketResource previous state should be Open.
+PASS: WebSocketResource state should change to Closed.
+PASS: WebSocketResource should be in a Closed state.
+
Added: trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close.html (0 => 213421)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close.html (rev 0)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close.html 2017-03-04 08:57:56 UTC (rev 213421)
@@ -0,0 +1,69 @@
+<!doctype html>
+<html>
+<head>
+<script src=""
+<script>
+function createWebSocketConnection()
+{
+ let webSocket = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/inspector/client-close");
+
+ webSocket._onopen_ = function()
+ {
+ webSocket.send("A message.");
+ };
+
+ webSocket._onmessage_ = function()
+ {
+ webSocket.close();
+ };
+}
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("WebSocket.ClientClose");
+
+ suite.addTestCase({
+ name: "WebSocket.ClientClose",
+ description: "WebInspector.WebSocketResource.Event.ReadyStateChanged events are fired in order when WebSocket connection is closed by the client.",
+ test(resolve, reject) {
+ WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, function(event) {
+ let resource = event.data.resource;
+
+ InspectorTest.expectThat(resource instanceof WebInspector.WebSocketResource, "WebSocketResource should be created.");
+ InspectorTest.expectEqual(resource.type, WebInspector.Resource.Type.WebSocket, "WebSocketResource should be a WebSocket type.");
+ InspectorTest.expectEqual(resource.readyState, WebInspector.WebSocketResource.ReadyState.Connecting, "WebSocketResource should be in a Connecting state.");
+
+ let runCount = 0;
+
+ resource.addEventListener(WebInspector.WebSocketResource.Event.ReadyStateChanged, function(event) {
+ let data = ""
+ runCount++;
+
+ if (runCount === 1) {
+ InspectorTest.expectEqual(data.previousState, WebInspector.WebSocketResource.ReadyState.Connecting, "WebSocketResource previous state should be Connecting.");
+ InspectorTest.expectEqual(data.state, WebInspector.WebSocketResource.ReadyState.Open, "WebSocketResource state should change to Open.");
+ InspectorTest.expectEqual(resource.readyState, WebInspector.WebSocketResource.ReadyState.Open, "WebSocketResource should be in a Open state.");
+ return;
+ }
+
+ if (runCount === 2) {
+ InspectorTest.expectEqual(data.previousState, WebInspector.WebSocketResource.ReadyState.Open, "WebSocketResource previous state should be Open.");
+ InspectorTest.expectEqual(data.state, WebInspector.WebSocketResource.ReadyState.Closed, "WebSocketResource state should change to Closed.");
+ InspectorTest.expectEqual(resource.readyState, WebInspector.WebSocketResource.ReadyState.Closed, "WebSocketResource should be in a Closed state.");
+ resolve();
+ }
+ });
+ });
+
+ InspectorTest.evaluateInPage("createWebSocketConnection()");
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests WebSockets connection closed by the client.</p>
+</body>
+</html>
Added: trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close_wsh.py (0 => 213421)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close_wsh.py (rev 0)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/client-close_wsh.py 2017-03-04 08:57:56 UTC (rev 213421)
@@ -0,0 +1,11 @@
+from mod_pywebsocket import msgutil
+
+
+def web_socket_do_extra_handshake(request):
+ pass # Always accept.
+
+
+def web_socket_transfer_data(request):
+ # Echo message back
+ message = msgutil.receive_message(request)
+ msgutil.send_message(request, message)
Added: trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close-expected.txt (0 => 213421)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close-expected.txt 2017-03-04 08:57:56 UTC (rev 213421)
@@ -0,0 +1,15 @@
+Tests WebSockets connection closed by the server.
+
+
+== Running test suite: WebSocket.ServerClose
+-- Running test case: WebSocket.ServerClose
+PASS: WebSocketResource should be created.
+PASS: WebSocketResource should be a WebSocket type.
+PASS: WebSocketResource should be in a Connecting state.
+PASS: WebSocketResource previous state should be Connecting.
+PASS: WebSocketResource state should change to Open.
+PASS: WebSocketResource should be in a Open state.
+PASS: WebSocketResource previous state should be Open.
+PASS: WebSocketResource state should change to Closed.
+PASS: WebSocketResource should be in a Closed state.
+
Added: trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close.html (0 => 213421)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close.html (rev 0)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close.html 2017-03-04 08:57:56 UTC (rev 213421)
@@ -0,0 +1,59 @@
+<!doctype html>
+<html>
+<head>
+<script src=""
+<script>
+function createWebSocketConnection()
+{
+ new WebSocket("ws://127.0.0.1:8880/websocket/tests/hybi/inspector/server-close");
+}
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("WebSocket.ServerClose");
+
+ suite.addTestCase({
+ name: "WebSocket.ServerClose",
+ description: "WebInspector.WebSocketResource.Event.ReadyStateChanged events are fired in order when WebSocket connection is closed by the server.",
+ test(resolve, reject) {
+ WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, function(event) {
+ let resource = event.data.resource;
+
+ InspectorTest.expectThat(resource instanceof WebInspector.WebSocketResource, "WebSocketResource should be created.");
+ InspectorTest.expectEqual(resource.type, WebInspector.Resource.Type.WebSocket, "WebSocketResource should be a WebSocket type.");
+ InspectorTest.expectEqual(resource.readyState, WebInspector.WebSocketResource.ReadyState.Connecting, "WebSocketResource should be in a Connecting state.");
+
+ let runCount = 0;
+
+ resource.addEventListener(WebInspector.WebSocketResource.Event.ReadyStateChanged, function(event) {
+ let data = ""
+ runCount++;
+
+ if (runCount === 1) {
+ InspectorTest.expectEqual(data.previousState, WebInspector.WebSocketResource.ReadyState.Connecting, "WebSocketResource previous state should be Connecting.");
+ InspectorTest.expectEqual(data.state, WebInspector.WebSocketResource.ReadyState.Open, "WebSocketResource state should change to Open.");
+ InspectorTest.expectEqual(resource.readyState, WebInspector.WebSocketResource.ReadyState.Open, "WebSocketResource should be in a Open state.");
+ return;
+ }
+
+ if (runCount === 2) {
+ InspectorTest.expectEqual(data.previousState, WebInspector.WebSocketResource.ReadyState.Open, "WebSocketResource previous state should be Open.");
+ InspectorTest.expectEqual(data.state, WebInspector.WebSocketResource.ReadyState.Closed, "WebSocketResource state should change to Closed.");
+ InspectorTest.expectEqual(resource.readyState, WebInspector.WebSocketResource.ReadyState.Closed, "WebSocketResource should be in a Closed state.");
+ resolve();
+ }
+ });
+ });
+
+ InspectorTest.evaluateInPage("createWebSocketConnection()");
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests WebSockets connection closed by the server.</p>
+</body>
+</html>
Added: trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close_wsh.py (0 => 213421)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close_wsh.py (rev 0)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/inspector/server-close_wsh.py 2017-03-04 08:57:56 UTC (rev 213421)
@@ -0,0 +1,7 @@
+def web_socket_do_extra_handshake(request):
+ pass
+
+
+def web_socket_transfer_data(request):
+ # After this handler exits, pywebsocket initiates the closing handshake.
+ pass
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (213420 => 213421)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2017-03-04 08:57:56 UTC (rev 213421)
@@ -212,6 +212,7 @@
# iOS doesn't have a local inspector
inspector/ [ Skip ]
http/tests/inspector/ [ Skip ]
+http/tests/websocket/tests/hybi/inspector/ [ Skip ]
# Some CSS3 Text tests are not enabled on iOS
webkit.org/b/76173 fast/css3-text/css3-text-align-last
Modified: trunk/Source/WebInspectorUI/ChangeLog (213420 => 213421)
--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-04 08:57:56 UTC (rev 213421)
@@ -1,3 +1,64 @@
+2017-03-04 Nikita Vasilyev <nvasil...@apple.com>
+
+ Web Inspector: Show Web Socket connections in Network tab
+ https://bugs.webkit.org/show_bug.cgi?id=167520
+
+ Reviewed by Joseph Pecoraro.
+
+ Show Web Socket connections in Network and Resources tabs. Display HTTP headers
+ of Web Socket handshake request in the details sidebar.
+
+ * UserInterface/Controllers/FrameResourceManager.js:
+ (WebInspector.FrameResourceManager.prototype.initialize):
+ (WebInspector.FrameResourceManager.prototype.webSocketCreated):
+ (WebInspector.FrameResourceManager.prototype.webSocketWillSendHandshakeRequest):
+ webSocketWillSendHandshakeRequest doesn't receive a request URL as one of its parameters.
+ Store URLs received from webSocketCreated method in _webSocketIdentifierToURL map.
+
+ (WebInspector.FrameResourceManager.prototype.webSocketHandshakeResponseReceived):
+ (WebInspector.FrameResourceManager.prototype.webSocketFrameReceived):
+ (WebInspector.FrameResourceManager.prototype.webSocketFrameSent):
+ (WebInspector.FrameResourceManager.prototype.webSocketClosed):
+ Mark resource as finished when Web Socket handshake is complete or Web Socket is closed.
+ This may change in the future.
+
+ (WebInspector.FrameResourceManager.prototype._webSocketFrameReceivedOrSent):
+ * UserInterface/Main.html:
+
+ * UserInterface/Models/WebSocketResource.js: Added.
+ (WebInspector.WebSocketResource):
+ (WebInspector.WebSocketResource.prototype.set readyState):
+ (WebInspector.WebSocketResource.prototype.get readyState):
+ (WebInspector.WebSocketResource.prototype.get frames):
+ (WebInspector.WebSocketResource.prototype.addFrame):
+ Introduce WebSocketResource model to store WebSocket frames (incoming and outgoing messages)
+ and readyState.
+
+ * UserInterface/Protocol/NetworkObserver.js:
+ (WebInspector.NetworkObserver.prototype.webSocketCreated):
+ (WebInspector.NetworkObserver.prototype.webSocketWillSendHandshakeRequest):
+ (WebInspector.NetworkObserver.prototype.webSocketHandshakeResponseReceived):
+ (WebInspector.NetworkObserver.prototype.webSocketClosed):
+ (WebInspector.NetworkObserver.prototype.webSocketFrameReceived):
+ (WebInspector.NetworkObserver.prototype.webSocketFrameError):
+ (WebInspector.NetworkObserver.prototype.webSocketFrameSent):
+ (WebInspector.NetworkObserver):
+ Add corresponding methods for the newly added FrameResourceManager methods.
+
+ * UserInterface/Test.html:
+ * UserInterface/Views/NetworkSidebarPanel.js:
+ (WebInspector.NetworkSidebarPanel.prototype.treeElementAddedOrChanged):
+ Don't show the go to arrow for WebSocket items since WebSocketContentView isn't implemented
+ yet.
+
+ * UserInterface/Views/ResourceClusterContentView.js:
+ (WebInspector.ResourceClusterContentView.prototype.get responseContentView):
+ Don't show any content views for WebSocket items.
+
+ * UserInterface/Views/ResourceTreeElement.js:
+ (WebInspector.ResourceTreeElement.prototype.ondblclick):
+ Don't open WebSocket URL in a new browser tab.
+
2017-03-02 Matt Baker <mattba...@apple.com>
Web Inspector: Should be able to push nodes in an iframe subtree to the frontend
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js (213420 => 213421)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js 2017-03-04 08:57:56 UTC (rev 213421)
@@ -49,6 +49,7 @@
this._mainFrame = null;
this._resourceRequestIdentifierMap = new Map;
this._orphanedResources = new Map;
+ this._webSocketIdentifierToURL = new Map;
if (this._mainFrame !== oldMainFrame)
this._mainFrameDidChange(oldMainFrame);
@@ -200,6 +201,94 @@
this._resourceRequestIdentifierMap.set(requestIdentifier, resource);
}
+ webSocketCreated(requestId, url)
+ {
+ this._webSocketIdentifierToURL.set(requestId, url);
+ }
+
+ webSocketWillSendHandshakeRequest(requestId, timestamp, request)
+ {
+ let url = ""
+ console.assert(url);
+ if (!url)
+ return;
+
+ // FIXME: <webkit.org/b/168475> Web Inspector: Correctly display iframe's and worker's WebSockets
+ let frameIdentifier = WebInspector.frameResourceManager.mainFrame.id;
+ let loaderIdentifier = WebInspector.frameResourceManager.mainFrame.id;
+ let targetId;
+
+ let frame = this.frameForIdentifier(frameIdentifier);
+ let requestData = null;
+ let elapsedTime = WebInspector.timelineManager.computeElapsedTime(timestamp);
+ let initiatorSourceCodeLocation = null;
+
+ let resource = new WebInspector.WebSocketResource(url, loaderIdentifier, targetId, requestId, request.headers, requestData, elapsedTime, initiatorSourceCodeLocation);
+ frame.addResource(resource);
+
+ this._resourceRequestIdentifierMap.set(requestId, resource);
+ }
+
+ webSocketHandshakeResponseReceived(requestId, timestamp, response)
+ {
+ let resource = this._resourceRequestIdentifierMap.get(requestId);
+ console.assert(resource);
+ if (!resource)
+ return;
+
+ resource.readyState = WebInspector.WebSocketResource.ReadyState.Open;
+
+ let elapsedTime = WebInspector.timelineManager.computeElapsedTime(timestamp);
+ resource.markAsFinished(elapsedTime);
+
+ // FIXME: <webkit.org/b/169166> Web Inspector: WebSockets: Implement timing information
+ let responseTiming = response.timing || null;
+
+ resource.updateForResponse(resource.url, resource.mimeType, resource.type, response.headers, response.status, response.statusText, elapsedTime, responseTiming);
+ }
+
+ webSocketFrameReceived(requestId, timestamp, response)
+ {
+ this._webSocketFrameReceivedOrSent(requestId, timestamp, response);
+ }
+
+ webSocketFrameSent(requestId, timestamp, response)
+ {
+ this._webSocketFrameReceivedOrSent(requestId, timestamp, response);
+ }
+
+ webSocketClosed(requestId, timestamp)
+ {
+ let resource = this._resourceRequestIdentifierMap.get(requestId);
+ console.assert(resource);
+ if (!resource)
+ return;
+
+ resource.readyState = WebInspector.WebSocketResource.ReadyState.Closed;
+
+ let elapsedTime = WebInspector.timelineManager.computeElapsedTime(timestamp);
+ resource.markAsFinished(elapsedTime);
+
+ this._webSocketIdentifierToURL.delete(requestId);
+ this._resourceRequestIdentifierMap.delete(requestId);
+ }
+
+ _webSocketFrameReceivedOrSent(requestId, timestamp, response)
+ {
+ let resource = this._resourceRequestIdentifierMap.get(requestId);
+ console.assert(resource);
+ if (!resource)
+ return;
+
+ let isIncoming = !!response.mask;
+ let data = ""
+ let opcode = response.opcode;
+
+ let elapsedTime = WebInspector.timelineManager.computeElapsedTime(timestamp);
+
+ resource.addFrame(data, isIncoming, opcode, timestamp, elapsedTime);
+ }
+
markResourceRequestAsServedFromMemoryCache(requestIdentifier)
{
// Called from WebInspector.NetworkObserver.
Modified: trunk/Source/WebInspectorUI/UserInterface/Main.html (213420 => 213421)
--- trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/Source/WebInspectorUI/UserInterface/Main.html 2017-03-04 08:57:56 UTC (rev 213421)
@@ -397,6 +397,7 @@
<script src=""
<script src=""
<script src=""
+ <script src=""
<script src=""
<script src=""
Added: trunk/Source/WebInspectorUI/UserInterface/Models/WebSocketResource.js (0 => 213421)
--- trunk/Source/WebInspectorUI/UserInterface/Models/WebSocketResource.js (rev 0)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/WebSocketResource.js 2017-03-04 08:57:56 UTC (rev 213421)
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+WebInspector.WebSocketResource = class WebSocketResource extends WebInspector.Resource
+{
+ constructor(url, loaderIdentifier, targetId, requestIdentifier, requestHeaders, requestData, requestSentTimestamp, initiatorSourceCodeLocation)
+ {
+ const type = WebInspector.Resource.Type.WebSocket;
+ const mimeType = null;
+ const requestMethod = "GET";
+ super(url, mimeType, type, loaderIdentifier, targetId, requestIdentifier, requestMethod, requestHeaders, requestData, requestSentTimestamp, initiatorSourceCodeLocation);
+
+ this._readyState = WebInspector.WebSocketResource.ReadyState.Connecting;
+ this._frames = [];
+ }
+
+ // Public
+
+ get frames() { return this._frames; }
+
+ get readyState()
+ {
+ return this._readyState;
+ }
+
+ set readyState(state)
+ {
+ if (state === this._readyState)
+ return;
+
+ let previousState = this._readyState;
+ this._readyState = state;
+
+ this.dispatchEventToListeners(WebInspector.WebSocketResource.Event.ReadyStateChanged, {previousState, state});
+ }
+
+ addFrame(data, isIncoming, opcode, timestamp, elapsedTime)
+ {
+ let frame = {data, isIncoming, opcode, timestamp, elapsedTime};
+ this._frames.push(frame);
+
+ this.dispatchEventToListeners(WebInspector.WebSocketResource.Event.FrameAdded, frame);
+ }
+};
+
+WebInspector.WebSocketResource.Event = {
+ FrameAdded: Symbol("web-socket-frame-added"),
+ ReadyStateChanged: Symbol("web-socket-resource-ready-state-changed"),
+};
+
+WebInspector.WebSocketResource.ReadyState = {
+ Closed: Symbol("web-socket-ready-state-closed"),
+ Connecting: Symbol("web-socket-ready-state-connecting"),
+ Open: Symbol("web-socket-ready-state-open"),
+};
Modified: trunk/Source/WebInspectorUI/UserInterface/Protocol/NetworkObserver.js (213420 => 213421)
--- trunk/Source/WebInspectorUI/UserInterface/Protocol/NetworkObserver.js 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/Source/WebInspectorUI/UserInterface/Protocol/NetworkObserver.js 2017-03-04 08:57:56 UTC (rev 213421)
@@ -62,29 +62,29 @@
WebInspector.frameResourceManager.resourceRequestWasServedFromMemoryCache(requestId, frameId, loaderId, resource, timestamp, initiator);
}
- webSocketWillSendHandshakeRequest(requestId, timestamp, request)
+ webSocketCreated(requestId, url)
{
- // FIXME: Not implemented.
+ WebInspector.frameResourceManager.webSocketCreated(requestId, url);
}
- webSocketHandshakeResponseReceived(requestId, timestamp, response)
+ webSocketWillSendHandshakeRequest(requestId, timestamp, request)
{
- // FIXME: Not implemented.
+ WebInspector.frameResourceManager.webSocketWillSendHandshakeRequest(requestId, timestamp, request);
}
- webSocketCreated(requestId, url)
+ webSocketHandshakeResponseReceived(requestId, timestamp, response)
{
- // FIXME: Not implemented.
+ WebInspector.frameResourceManager.webSocketHandshakeResponseReceived(requestId, timestamp, response);
}
webSocketClosed(requestId, timestamp)
{
- // FIXME: Not implemented.
+ WebInspector.frameResourceManager.webSocketClosed(requestId, timestamp);
}
webSocketFrameReceived(requestId, timestamp, response)
{
- // FIXME: Not implemented.
+ WebInspector.frameResourceManager.webSocketFrameReceived(requestId, timestamp, response);
}
webSocketFrameError(requestId, timestamp, errorMessage)
@@ -94,6 +94,6 @@
webSocketFrameSent(requestId, timestamp, response)
{
- // FIXME: Not implemented.
+ WebInspector.frameResourceManager.webSocketFrameSent(requestId, timestamp, response);
}
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Test.html (213420 => 213421)
--- trunk/Source/WebInspectorUI/UserInterface/Test.html 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/Source/WebInspectorUI/UserInterface/Test.html 2017-03-04 08:57:56 UTC (rev 213421)
@@ -171,6 +171,7 @@
<script src=""
<script src=""
<script src=""
+ <script src=""
<script src=""
<script src=""
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js (213420 => 213421)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkSidebarPanel.js 2017-03-04 08:57:56 UTC (rev 213421)
@@ -168,10 +168,13 @@
closeButton.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this._treeElementCloseButtonClicked, this);
fragment.appendChild(closeButton.element);
- var goToButton = new WebInspector.TreeElementStatusButton(WebInspector.createGoToArrowButton());
- goToButton[WebInspector.NetworkSidebarPanel.TreeElementSymbol] = treeElement;
- goToButton.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this._treeElementGoToArrowWasClicked, this);
- fragment.appendChild(goToButton.element);
+ // FIXME: <webkit.org/b/169011> Web Inspector: Show individual messages in the content pane for a WebSocket
+ if (treeElement.resource.type !== WebInspector.Resource.Type.WebSocket) {
+ let goToButton = new WebInspector.TreeElementStatusButton(WebInspector.createGoToArrowButton());
+ goToButton[WebInspector.NetworkSidebarPanel.TreeElementSymbol] = treeElement;
+ goToButton.addEventListener(WebInspector.TreeElementStatusButton.Event.Clicked, this._treeElementGoToArrowWasClicked, this);
+ fragment.appendChild(goToButton.element);
+ }
treeElement.status = fragment;
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js (213420 => 213421)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceClusterContentView.js 2017-03-04 08:57:56 UTC (rev 213421)
@@ -83,6 +83,10 @@
this._responseContentView = new WebInspector.FontResourceContentView(this._resource);
break;
+ case WebInspector.Resource.Type.WebSocket:
+ // FIXME: <webkit.org/b/169011> Web Inspector: Show individual messages in the content pane for a WebSocket
+ break;
+
default:
this._responseContentView = new WebInspector.GenericResourceContentView(this._resource);
break;
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js (213420 => 213421)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2017-03-04 08:38:06 UTC (rev 213420)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ResourceTreeElement.js 2017-03-04 08:57:56 UTC (rev 213421)
@@ -91,6 +91,9 @@
ondblclick()
{
+ if (this._resource.type === WebInspector.Resource.Type.WebSocket)
+ return;
+
InspectorFrontendHost.openInNewTab(this._resource.url);
}
