<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191717] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191717">191717</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-28 18:30:16 -0700 (Wed, 28 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove unused / duplicate WebSocket timeline records
https://bugs.webkit.org/show_bug.cgi?id=150647
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-10-28
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
* inspector/protocol/Timeline.json:
Source/WebCore:
* Modules/websockets/WebSocketChannel.cpp:
(WebCore::WebSocketChannel::connect):
Only send what is needed by inspector now.
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didCreateWebSocket):
(WebCore::InspectorInstrumentation::willSendWebSocketHandshakeRequest):
(WebCore::InspectorInstrumentation::didReceiveWebSocketHandshakeResponse):
(WebCore::InspectorInstrumentation::didCloseWebSocket):
(WebCore::InspectorInstrumentation::didReceiveWebSocketFrame):
(WebCore::InspectorInstrumentation::didReceiveWebSocketFrameError):
(WebCore::InspectorInstrumentation::didSendWebSocketFrame):
These can all fast return if there is no frontend because the inspector
doesn't record any information about web sockets until a frontend is connected.
The inspector in this case just sends events to the frontend when things happen.
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didCreateWebSocketImpl):
(WebCore::InspectorInstrumentation::willSendWebSocketHandshakeRequestImpl):
(WebCore::InspectorInstrumentation::didReceiveWebSocketHandshakeResponseImpl):
(WebCore::InspectorInstrumentation::didCloseWebSocketImpl):
Stop messaging the Timeline agent, we already message the Resource agent.
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didCreateWebSocket): Deleted.
(WebCore::InspectorTimelineAgent::willSendWebSocketHandshakeRequest): Deleted.
(WebCore::InspectorTimelineAgent::didReceiveWebSocketHandshakeResponse): Deleted.
(WebCore::InspectorTimelineAgent::didDestroyWebSocket): Deleted.
* inspector/InspectorTimelineAgent.h:
* inspector/TimelineRecordFactory.h:
(WebCore::TimelineRecordFactory::createWebSocketCreateData): Deleted.
(WebCore::TimelineRecordFactory::createGenericWebSocketData): Deleted.
This is all duplicate information from the network domain.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorprotocolTimelinejson">trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgentcpp">trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorTimelineAgenth">trunk/Source/WebCore/inspector/InspectorTimelineAgent.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactoryh">trunk/Source/WebCore/inspector/TimelineRecordFactory.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-10-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Remove unused / duplicate WebSocket timeline records
+ https://bugs.webkit.org/show_bug.cgi?id=150647
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/protocol/Timeline.json:
+
</ins><span class="cx"> 2015-10-28 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> B3::LowerToAir should not duplicate Loads
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -28,11 +28,7 @@
</span><span class="cx"> "ConsoleProfile",
</span><span class="cx"> "RequestAnimationFrame",
</span><span class="cx"> "CancelAnimationFrame",
</span><del>- "FireAnimationFrame",
- "WebSocketCreate",
- "WebSocketSendHandshakeRequest",
- "WebSocketReceiveHandshakeResponse",
- "WebSocketDestroy"
</del><ins>+ "FireAnimationFrame"
</ins><span class="cx"> ],
</span><span class="cx"> "description": "Timeline record type."
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/WebCore/ChangeLog 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-10-28 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Remove unused / duplicate WebSocket timeline records
+ https://bugs.webkit.org/show_bug.cgi?id=150647
+
+ Reviewed by Timothy Hatcher.
+
+ * Modules/websockets/WebSocketChannel.cpp:
+ (WebCore::WebSocketChannel::connect):
+ Only send what is needed by inspector now.
+
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didCreateWebSocket):
+ (WebCore::InspectorInstrumentation::willSendWebSocketHandshakeRequest):
+ (WebCore::InspectorInstrumentation::didReceiveWebSocketHandshakeResponse):
+ (WebCore::InspectorInstrumentation::didCloseWebSocket):
+ (WebCore::InspectorInstrumentation::didReceiveWebSocketFrame):
+ (WebCore::InspectorInstrumentation::didReceiveWebSocketFrameError):
+ (WebCore::InspectorInstrumentation::didSendWebSocketFrame):
+ These can all fast return if there is no frontend because the inspector
+ doesn't record any information about web sockets until a frontend is connected.
+ The inspector in this case just sends events to the frontend when things happen.
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didCreateWebSocketImpl):
+ (WebCore::InspectorInstrumentation::willSendWebSocketHandshakeRequestImpl):
+ (WebCore::InspectorInstrumentation::didReceiveWebSocketHandshakeResponseImpl):
+ (WebCore::InspectorInstrumentation::didCloseWebSocketImpl):
+ Stop messaging the Timeline agent, we already message the Resource agent.
+
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::InspectorTimelineAgent::didCreateWebSocket): Deleted.
+ (WebCore::InspectorTimelineAgent::willSendWebSocketHandshakeRequest): Deleted.
+ (WebCore::InspectorTimelineAgent::didReceiveWebSocketHandshakeResponse): Deleted.
+ (WebCore::InspectorTimelineAgent::didDestroyWebSocket): Deleted.
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/TimelineRecordFactory.h:
+ (WebCore::TimelineRecordFactory::createWebSocketCreateData): Deleted.
+ (WebCore::TimelineRecordFactory::createGenericWebSocketData): Deleted.
+ This is all duplicate information from the network domain.
+
</ins><span class="cx"> 2015-10-28 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Content Filtering] Crash when allowing a 0-byte resource to load
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/WebCore/Modules/websockets/WebSocketChannel.cpp 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> if (m_deflateFramer.canDeflate())
</span><span class="cx"> m_handshake->addExtensionProcessor(m_deflateFramer.createExtensionProcessor());
</span><span class="cx"> if (m_identifier)
</span><del>- InspectorInstrumentation::didCreateWebSocket(m_document, m_identifier, url, m_document->url(), protocol);
</del><ins>+ InspectorInstrumentation::didCreateWebSocket(m_document, m_identifier, url);
</ins><span class="cx">
</span><span class="cx"> if (Frame* frame = m_document->frame()) {
</span><span class="cx"> if (NetworkingContext* networkingContext = frame->loader().networkingContext()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -960,51 +960,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><del>-void InspectorInstrumentation::didCreateWebSocketImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const URL& requestURL, const URL&, const String& protocol, Document* document)
</del><ins>+void InspectorInstrumentation::didCreateWebSocketImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const URL& requestURL)
</ins><span class="cx"> {
</span><span class="cx"> if (!instrumentingAgents.inspectorEnvironment().developerExtrasEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!document)
- return;
-
</del><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didCreateWebSocket(identifier, requestURL);
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didCreateWebSocket(identifier, requestURL, protocol, document->frame());
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::willSendWebSocketHandshakeRequestImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const ResourceRequest& request, Document* document)
</del><ins>+void InspectorInstrumentation::willSendWebSocketHandshakeRequestImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const ResourceRequest& request)
</ins><span class="cx"> {
</span><del>- if (!document)
- return;
-
</del><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->willSendWebSocketHandshakeRequest(identifier, request);
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->willSendWebSocketHandshakeRequest(identifier, document->frame());
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const ResourceResponse& response, Document* document)
</del><ins>+void InspectorInstrumentation::didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- if (!document)
- return;
-
</del><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didReceiveWebSocketHandshakeResponse(identifier, response);
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didReceiveWebSocketHandshakeResponse(identifier, document->frame());
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::didCloseWebSocketImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, Document* document)
</del><ins>+void InspectorInstrumentation::didCloseWebSocketImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier)
</ins><span class="cx"> {
</span><del>- if (!document)
- return;
-
</del><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didCloseWebSocket(identifier);
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didDestroyWebSocket(identifier, document->frame());
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didReceiveWebSocketFrameImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const WebSocketFrame& frame)
</span><span class="lines">@@ -1012,11 +992,13 @@
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didReceiveWebSocketFrame(identifier, frame);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> void InspectorInstrumentation::didReceiveWebSocketFrameErrorImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const String& errorMessage)
</span><span class="cx"> {
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didReceiveWebSocketFrameError(identifier, errorMessage);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> void InspectorInstrumentation::didSendWebSocketFrameImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, const WebSocketFrame& frame)
</span><span class="cx"> {
</span><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><del>- static void didCreateWebSocket(Document*, unsigned long identifier, const URL& requestURL, const URL& documentURL, const String& protocol);
</del><ins>+ static void didCreateWebSocket(Document*, unsigned long identifier, const URL& requestURL);
</ins><span class="cx"> static void willSendWebSocketHandshakeRequest(Document*, unsigned long identifier, const ResourceRequest&);
</span><span class="cx"> static void didReceiveWebSocketHandshakeResponse(Document*, unsigned long identifier, const ResourceResponse&);
</span><span class="cx"> static void didCloseWebSocket(Document*, unsigned long identifier);
</span><span class="lines">@@ -429,10 +429,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><del>- static void didCreateWebSocketImpl(InstrumentingAgents&, unsigned long identifier, const URL& requestURL, const URL& documentURL, const String& protocol, Document*);
- static void willSendWebSocketHandshakeRequestImpl(InstrumentingAgents&, unsigned long identifier, const ResourceRequest&, Document*);
- static void didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents&, unsigned long identifier, const ResourceResponse&, Document*);
- static void didCloseWebSocketImpl(InstrumentingAgents&, unsigned long identifier, Document*);
</del><ins>+ static void didCreateWebSocketImpl(InstrumentingAgents&, unsigned long identifier, const URL& requestURL);
+ static void willSendWebSocketHandshakeRequestImpl(InstrumentingAgents&, unsigned long identifier, const ResourceRequest&);
+ static void didReceiveWebSocketHandshakeResponseImpl(InstrumentingAgents&, unsigned long identifier, const ResourceResponse&);
+ static void didCloseWebSocketImpl(InstrumentingAgents&, unsigned long identifier);
</ins><span class="cx"> static void didReceiveWebSocketFrameImpl(InstrumentingAgents&, unsigned long identifier, const WebSocketFrame&);
</span><span class="cx"> static void didSendWebSocketFrameImpl(InstrumentingAgents&, unsigned long identifier, const WebSocketFrame&);
</span><span class="cx"> static void didReceiveWebSocketFrameErrorImpl(InstrumentingAgents&, unsigned long identifier, const String&);
</span><span class="lines">@@ -1107,44 +1107,51 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><del>-inline void InspectorInstrumentation::didCreateWebSocket(Document* document, unsigned long identifier, const URL& requestURL, const URL& documentURL, const String& protocol)
</del><ins>+inline void InspectorInstrumentation::didCreateWebSocket(Document* document, unsigned long identifier, const URL& requestURL)
</ins><span class="cx"> {
</span><ins>+ FAST_RETURN_IF_NO_FRONTENDS(void());
</ins><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
</span><del>- didCreateWebSocketImpl(*instrumentingAgents, identifier, requestURL, documentURL, protocol, document);
</del><ins>+ didCreateWebSocketImpl(*instrumentingAgents, identifier, requestURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::willSendWebSocketHandshakeRequest(Document* document, unsigned long identifier, const ResourceRequest& request)
</span><span class="cx"> {
</span><ins>+ FAST_RETURN_IF_NO_FRONTENDS(void());
</ins><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
</span><del>- willSendWebSocketHandshakeRequestImpl(*instrumentingAgents, identifier, request, document);
</del><ins>+ willSendWebSocketHandshakeRequestImpl(*instrumentingAgents, identifier, request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::didReceiveWebSocketHandshakeResponse(Document* document, unsigned long identifier, const ResourceResponse& response)
</span><span class="cx"> {
</span><ins>+ FAST_RETURN_IF_NO_FRONTENDS(void());
</ins><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
</span><del>- didReceiveWebSocketHandshakeResponseImpl(*instrumentingAgents, identifier, response, document);
</del><ins>+ didReceiveWebSocketHandshakeResponseImpl(*instrumentingAgents, identifier, response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::didCloseWebSocket(Document* document, unsigned long identifier)
</span><span class="cx"> {
</span><ins>+ FAST_RETURN_IF_NO_FRONTENDS(void());
</ins><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
</span><del>- didCloseWebSocketImpl(*instrumentingAgents, identifier, document);
</del><ins>+ didCloseWebSocketImpl(*instrumentingAgents, identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::didReceiveWebSocketFrame(Document* document, unsigned long identifier, const WebSocketFrame& frame)
</span><span class="cx"> {
</span><ins>+ FAST_RETURN_IF_NO_FRONTENDS(void());
</ins><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
</span><span class="cx"> didReceiveWebSocketFrameImpl(*instrumentingAgents, identifier, frame);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::didReceiveWebSocketFrameError(Document* document, unsigned long identifier, const String& errorMessage)
</span><span class="cx"> {
</span><ins>+ FAST_RETURN_IF_NO_FRONTENDS(void());
</ins><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
</span><span class="cx"> didReceiveWebSocketFrameErrorImpl(*instrumentingAgents, identifier, errorMessage);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::didSendWebSocketFrame(Document* document, unsigned long identifier, const WebSocketFrame& frame)
</span><span class="cx"> {
</span><ins>+ FAST_RETURN_IF_NO_FRONTENDS(void());
</ins><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
</span><span class="cx"> didSendWebSocketFrameImpl(*instrumentingAgents, identifier, frame);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -521,28 +521,6 @@
</span><span class="cx"> didCompleteCurrentRecord(TimelineRecordType::FireAnimationFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(WEB_SOCKETS)
-void InspectorTimelineAgent::didCreateWebSocket(unsigned long identifier, const URL& url, const String& protocol, Frame* frame)
-{
- appendRecord(TimelineRecordFactory::createWebSocketCreateData(identifier, url, protocol), TimelineRecordType::WebSocketCreate, true, frame);
-}
-
-void InspectorTimelineAgent::willSendWebSocketHandshakeRequest(unsigned long identifier, Frame* frame)
-{
- appendRecord(TimelineRecordFactory::createGenericWebSocketData(identifier), TimelineRecordType::WebSocketSendHandshakeRequest, true, frame);
-}
-
-void InspectorTimelineAgent::didReceiveWebSocketHandshakeResponse(unsigned long identifier, Frame* frame)
-{
- appendRecord(TimelineRecordFactory::createGenericWebSocketData(identifier), TimelineRecordType::WebSocketReceiveHandshakeResponse, false, frame);
-}
-
-void InspectorTimelineAgent::didDestroyWebSocket(unsigned long identifier, Frame* frame)
-{
- appendRecord(TimelineRecordFactory::createGenericWebSocketData(identifier), TimelineRecordType::WebSocketDestroy, true, frame);
-}
-#endif // ENABLE(WEB_SOCKETS)
-
</del><span class="cx"> // ScriptDebugListener
</span><span class="cx">
</span><span class="cx"> void InspectorTimelineAgent::breakpointActionProbe(JSC::ExecState* exec, const Inspector::ScriptBreakpointAction& action, unsigned batchId, unsigned sampleId, const Deprecated::ScriptValue&)
</span><span class="lines">@@ -606,15 +584,6 @@
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::CancelAnimationFrame;
</span><span class="cx"> case TimelineRecordType::FireAnimationFrame:
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::FireAnimationFrame;
</span><del>-
- case TimelineRecordType::WebSocketCreate:
- return Inspector::Protocol::Timeline::EventType::WebSocketCreate;
- case TimelineRecordType::WebSocketSendHandshakeRequest:
- return Inspector::Protocol::Timeline::EventType::WebSocketSendHandshakeRequest;
- case TimelineRecordType::WebSocketReceiveHandshakeResponse:
- return Inspector::Protocol::Timeline::EventType::WebSocketReceiveHandshakeResponse;
- case TimelineRecordType::WebSocketDestroy:
- return Inspector::Protocol::Timeline::EventType::WebSocketDestroy;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::TimeStamp;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -93,11 +93,6 @@
</span><span class="cx"> RequestAnimationFrame,
</span><span class="cx"> CancelAnimationFrame,
</span><span class="cx"> FireAnimationFrame,
</span><del>-
- WebSocketCreate,
- WebSocketSendHandshakeRequest,
- WebSocketReceiveHandshakeResponse,
- WebSocketDestroy
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class InspectorTimelineAgent final
</span><span class="lines">@@ -158,12 +153,6 @@
</span><span class="cx"> void didFireAnimationFrame();
</span><span class="cx"> void time(Frame&, const String&);
</span><span class="cx"> void timeEnd(Frame&, const String&);
</span><del>-#if ENABLE(WEB_SOCKETS)
- void didCreateWebSocket(unsigned long identifier, const URL&, const String& protocol, Frame*);
- void willSendWebSocketHandshakeRequest(unsigned long identifier, Frame*);
- void didReceiveWebSocketHandshakeResponse(unsigned long identifier, Frame*);
- void didDestroyWebSocket(unsigned long identifier, Frame*);
-#endif
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> // ScriptDebugListener
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.h (191716 => 191717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2015-10-29 01:28:06 UTC (rev 191716)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2015-10-29 01:30:16 UTC (rev 191717)
</span><span class="lines">@@ -85,24 +85,6 @@
</span><span class="cx">
</span><span class="cx"> static void appendProfile(Inspector::InspectorObject*, RefPtr<JSC::Profile>&&);
</span><span class="cx">
</span><del>-#if ENABLE(WEB_SOCKETS)
- static inline Ref<Inspector::InspectorObject> createWebSocketCreateData(unsigned long identifier, const URL& url, const String& protocol)
- {
- Ref<Inspector::InspectorObject> data = Inspector::InspectorObject::create();
- data->setInteger("identifier", identifier);
- data->setString("url", url.string());
- if (!protocol.isNull())
- data->setString("webSocketProtocol", protocol);
- return WTF::move(data);
- }
-
- static inline Ref<Inspector::InspectorObject> createGenericWebSocketData(unsigned long identifier)
- {
- Ref<Inspector::InspectorObject> data = Inspector::InspectorObject::create();
- data->setInteger("identifier", identifier);
- return WTF::move(data);
- }
-#endif
</del><span class="cx"> private:
</span><span class="cx"> TimelineRecordFactory() { }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>