<!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>[178201] 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/178201">178201</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-09 14:26:25 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Remove or use TimelineAgent Resource related event types
https://bugs.webkit.org/show_bug.cgi?id=140155
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-01-09
Reviewed by Timothy Hatcher.
Source/JavaScriptCore:
Remove unused / stale Timeline event types.
* inspector/protocol/Timeline.json:
Source/WebCore:
Remove unused timeline events. The frontend was ignoring these events
and was often already getting nearly identical data from the Network domain.
* WebCore.exp.in:
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::willSendRequestImpl):
(WebCore::InspectorInstrumentation::willReceiveResourceResponseImpl):
(WebCore::InspectorInstrumentation::didReceiveResourceResponseImpl):
(WebCore::InspectorInstrumentation::didReceiveResourceResponseButCanceledImpl):
(WebCore::InspectorInstrumentation::didFinishLoadingImpl):
(WebCore::InspectorInstrumentation::didFailLoadingImpl):
(WebCore::InspectorInstrumentation::didScheduleResourceRequestImpl): Deleted.
(WebCore::InspectorInstrumentation::willReceiveResourceDataImpl): Deleted.
(WebCore::InspectorInstrumentation::didReceiveResourceDataImpl): Deleted.
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::willReceiveResourceResponse):
(WebCore::InspectorInstrumentation::didScheduleResourceRequest): Deleted.
(WebCore::InspectorInstrumentation::willReceiveResourceData): Deleted.
(WebCore::InspectorInstrumentation::didReceiveResourceData): Deleted.
* inspector/InspectorTimelineAgent.cpp:
(WebCore::toProtocol):
(WebCore::InspectorTimelineAgent::didScheduleResourceRequest): Deleted.
(WebCore::InspectorTimelineAgent::willSendResourceRequest): Deleted.
(WebCore::InspectorTimelineAgent::willReceiveResourceData): Deleted.
(WebCore::InspectorTimelineAgent::didReceiveResourceData): Deleted.
(WebCore::InspectorTimelineAgent::willReceiveResourceResponse): Deleted.
(WebCore::InspectorTimelineAgent::didReceiveResourceResponse): Deleted.
(WebCore::InspectorTimelineAgent::didFinishLoadingResource): Deleted.
* inspector/InspectorTimelineAgent.h:
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::createScheduleResourceRequestData): Deleted.
(WebCore::TimelineRecordFactory::createResourceSendRequestData): Deleted.
(WebCore::TimelineRecordFactory::createResourceReceiveResponseData): Deleted.
(WebCore::TimelineRecordFactory::createResourceFinishData): Deleted.
(WebCore::TimelineRecordFactory::createReceiveResourceData): Deleted.
* inspector/TimelineRecordFactory.h:
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::didReceiveResponse):
* loader/ResourceLoadNotifier.cpp:
(WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
* loader/ResourceLoadScheduler.cpp:
(WebCore::ResourceLoadScheduler::scheduleLoad):
(WebCore::ResourceLoadScheduler::notifyDidScheduleResourceRequest): Deleted.
* loader/ResourceLoadScheduler.h:
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::didReceiveData):
(WebCore::ResourceLoader::didReceiveBuffer):
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::didReceiveResponse):
* loader/mac/ResourceLoaderMac.mm:
(WebCore::ResourceLoader::didReceiveDataArray):
Source/WebKit2:
* WebProcess/Network/WebResourceLoadScheduler.cpp:
(WebKit::WebResourceLoadScheduler::scheduleLoad):</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="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</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="#trunkSourceWebCoreinspectorTimelineRecordFactorycpp">trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorTimelineRecordFactoryh">trunk/Source/WebCore/inspector/TimelineRecordFactory.h</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadNotifiercpp">trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadSchedulercpp">trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadSchedulerh">trunk/Source/WebCore/loader/ResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadermacResourceLoaderMacmm">trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-09 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Remove or use TimelineAgent Resource related event types
+ https://bugs.webkit.org/show_bug.cgi?id=140155
+
+ Reviewed by Timothy Hatcher.
+
+ Remove unused / stale Timeline event types.
+
+ * inspector/protocol/Timeline.json:
+
</ins><span class="cx"> 2015-01-09 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r177925): It broke the !ENABLE(INSPECTOR) build
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorprotocolTimelinejson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/JavaScriptCore/inspector/protocol/Timeline.json 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> {
</span><span class="cx"> "id": "EventType",
</span><span class="cx"> "type": "string",
</span><del>- "enum": ["EventDispatch", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "ScheduleResourceRequest", "ResourceSendRequest", "ResourceReceiveResponse", "ResourceReceivedData", "ResourceFinish", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "ProbeSample", "ConsoleProfile", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest&quo
t;, "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</del><ins>+ "enum": ["EventDispatch", "ScheduleStyleRecalculation", "RecalculateStyles", "InvalidateLayout", "Layout", "Paint", "ScrollLayer", "ResizeImage", "ParseHTML", "TimerInstall", "TimerRemove", "TimerFire", "EvaluateScript", "MarkLoad", "MarkDOMContent", "TimeStamp", "Time", "TimeEnd", "XHRReadyStateChange", "XHRLoad", "FunctionCall", "ProbeSample", "ConsoleProfile", "GCEvent", "RequestAnimationFrame", "CancelAnimationFrame", "FireAnimationFrame", "WebSocketCreate", "WebSocketSendHandshakeRequest", "WebSocketReceiveHandshakeResponse", "WebSocketDestroy"],
</ins><span class="cx"> "description": "Timeline record type."
</span><span class="cx"> },
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/ChangeLog 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -1,3 +1,62 @@
</span><ins>+2015-01-09 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Remove or use TimelineAgent Resource related event types
+ https://bugs.webkit.org/show_bug.cgi?id=140155
+
+ Reviewed by Timothy Hatcher.
+
+ Remove unused timeline events. The frontend was ignoring these events
+ and was often already getting nearly identical data from the Network domain.
+
+ * WebCore.exp.in:
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::willSendRequestImpl):
+ (WebCore::InspectorInstrumentation::willReceiveResourceResponseImpl):
+ (WebCore::InspectorInstrumentation::didReceiveResourceResponseImpl):
+ (WebCore::InspectorInstrumentation::didReceiveResourceResponseButCanceledImpl):
+ (WebCore::InspectorInstrumentation::didFinishLoadingImpl):
+ (WebCore::InspectorInstrumentation::didFailLoadingImpl):
+ (WebCore::InspectorInstrumentation::didScheduleResourceRequestImpl): Deleted.
+ (WebCore::InspectorInstrumentation::willReceiveResourceDataImpl): Deleted.
+ (WebCore::InspectorInstrumentation::didReceiveResourceDataImpl): Deleted.
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::willReceiveResourceResponse):
+ (WebCore::InspectorInstrumentation::didScheduleResourceRequest): Deleted.
+ (WebCore::InspectorInstrumentation::willReceiveResourceData): Deleted.
+ (WebCore::InspectorInstrumentation::didReceiveResourceData): Deleted.
+ * inspector/InspectorTimelineAgent.cpp:
+ (WebCore::toProtocol):
+ (WebCore::InspectorTimelineAgent::didScheduleResourceRequest): Deleted.
+ (WebCore::InspectorTimelineAgent::willSendResourceRequest): Deleted.
+ (WebCore::InspectorTimelineAgent::willReceiveResourceData): Deleted.
+ (WebCore::InspectorTimelineAgent::didReceiveResourceData): Deleted.
+ (WebCore::InspectorTimelineAgent::willReceiveResourceResponse): Deleted.
+ (WebCore::InspectorTimelineAgent::didReceiveResourceResponse): Deleted.
+ (WebCore::InspectorTimelineAgent::didFinishLoadingResource): Deleted.
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/TimelineRecordFactory.cpp:
+ (WebCore::TimelineRecordFactory::createScheduleResourceRequestData): Deleted.
+ (WebCore::TimelineRecordFactory::createResourceSendRequestData): Deleted.
+ (WebCore::TimelineRecordFactory::createResourceReceiveResponseData): Deleted.
+ (WebCore::TimelineRecordFactory::createResourceFinishData): Deleted.
+ (WebCore::TimelineRecordFactory::createReceiveResourceData): Deleted.
+ * inspector/TimelineRecordFactory.h:
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::didReceiveResponse):
+ * loader/ResourceLoadNotifier.cpp:
+ (WebCore::ResourceLoadNotifier::dispatchDidReceiveResponse):
+ * loader/ResourceLoadScheduler.cpp:
+ (WebCore::ResourceLoadScheduler::scheduleLoad):
+ (WebCore::ResourceLoadScheduler::notifyDidScheduleResourceRequest): Deleted.
+ * loader/ResourceLoadScheduler.h:
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::didReceiveData):
+ (WebCore::ResourceLoader::didReceiveBuffer):
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::didReceiveResponse):
+ * loader/mac/ResourceLoaderMac.mm:
+ (WebCore::ResourceLoader::didReceiveDataArray):
+
</ins><span class="cx"> 2015-01-09 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Update r177745, one of the review comments was not integrated
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -945,7 +945,6 @@
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler21resumePendingRequestsEv
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler22suspendPendingRequestsEv
</span><span class="cx"> __ZN7WebCore21ResourceLoadScheduler24schedulePluginStreamLoadEPNS_5FrameEPNS_32NetscapePlugInStreamLoaderClientERKNS_15ResourceRequestE
</span><del>-__ZN7WebCore21ResourceLoadScheduler32notifyDidScheduleResourceRequestEPNS_14ResourceLoaderE
</del><span class="cx"> __ZN7WebCore21ResourceLoadScheduler6removeEPNS_14ResourceLoaderE
</span><span class="cx"> __ZN7WebCore21ResourceLoadSchedulerC2Ev
</span><span class="cx"> __ZN7WebCore21ResourceLoadSchedulerD2Ev
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -290,12 +290,6 @@
</span><span class="cx"> domDebuggerAgent->willSendXMLHttpRequest(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::didScheduleResourceRequestImpl(InstrumentingAgents& instrumentingAgents, const String& url, Frame* frame)
-{
- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didScheduleResourceRequest(url, frame);
-}
-
</del><span class="cx"> void InspectorInstrumentation::didInstallTimerImpl(InstrumentingAgents& instrumentingAgents, int timerId, int timeout, bool singleShot, ScriptExecutionContext* context)
</span><span class="cx"> {
</span><span class="cx"> pauseOnNativeEventIfNeeded(instrumentingAgents, false, setTimerEventName, true);
</span><span class="lines">@@ -555,8 +549,6 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->willSendResourceRequest(identifier, request, loader->frame());
</del><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->willSendRequest(identifier, *loader, request, redirectResponse);
</span><span class="cx"> }
</span><span class="lines">@@ -584,33 +576,11 @@
</span><span class="cx"> resourceAgent->didLoadResourceFromMemoryCache(*loader, *cachedResource);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceDataImpl(InstrumentingAgents& instrumentingAgents, Frame* frame, unsigned long identifier, int length)
</del><ins>+InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceResponseImpl(InstrumentingAgents& instrumentingAgents)
</ins><span class="cx"> {
</span><del>- int timelineAgentId = 0;
- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent()) {
- timelineAgent->willReceiveResourceData(identifier, frame, length);
- timelineAgentId = timelineAgent->id();
- }
- return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
</del><ins>+ return InspectorInstrumentationCookie(instrumentingAgents, 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::didReceiveResourceDataImpl(const InspectorInstrumentationCookie& cookie)
-{
- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
- timelineAgent->didReceiveResourceData();
-}
-
-InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceResponseImpl(InstrumentingAgents& instrumentingAgents, Frame* frame, unsigned long identifier, const ResourceResponse& response)
-{
- int timelineAgentId = 0;
- InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent();
- if (timelineAgent && frame) {
- timelineAgent->willReceiveResourceResponse(identifier, response, frame);
- timelineAgentId = timelineAgent->id();
- }
- return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
-}
-
</del><span class="cx"> void InspectorInstrumentation::didReceiveResourceResponseImpl(const InspectorInstrumentationCookie& cookie, unsigned long identifier, DocumentLoader* loader, const ResourceResponse& response, ResourceLoader* resourceLoader)
</span><span class="cx"> {
</span><span class="cx"> if (!cookie.isValid())
</span><span class="lines">@@ -621,8 +591,6 @@
</span><span class="cx">
</span><span class="cx"> InstrumentingAgents& instrumentingAgents = *cookie.instrumentingAgents();
</span><span class="cx">
</span><del>- if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
- timelineAgent->didReceiveResourceResponse();
</del><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didReceiveResponse(identifier, *loader, response, resourceLoader);
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span><span class="lines">@@ -634,7 +602,7 @@
</span><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(frame, identifier, r);
</del><ins>+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(frame);
</ins><span class="cx"> InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, &loader, r, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -664,8 +632,6 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didFinishLoadingResource(identifier, false, finishTime, loader->frame());
</del><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didFinishLoading(identifier, *loader, finishTime);
</span><span class="cx"> }
</span><span class="lines">@@ -675,8 +641,6 @@
</span><span class="cx"> if (!loader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (InspectorTimelineAgent* timelineAgent = instrumentingAgents.inspectorTimelineAgent())
- timelineAgent->didFinishLoadingResource(identifier, true, 0, loader->frame());
</del><span class="cx"> if (InspectorResourceAgent* resourceAgent = instrumentingAgents.inspectorResourceAgent())
</span><span class="cx"> resourceAgent->didFailLoading(identifier, *loader, error);
</span><span class="cx"> if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -137,7 +137,6 @@
</span><span class="cx"> static bool forcePseudoState(Element&, CSSSelector::PseudoClassType);
</span><span class="cx">
</span><span class="cx"> static void willSendXMLHttpRequest(ScriptExecutionContext*, const String& url);
</span><del>- static void didScheduleResourceRequest(Document*, const String& url);
</del><span class="cx"> static void didInstallTimer(ScriptExecutionContext*, int timerId, int timeout, bool singleShot);
</span><span class="cx"> static void didRemoveTimer(ScriptExecutionContext*, int timerId);
</span><span class="cx">
</span><span class="lines">@@ -175,9 +174,7 @@
</span><span class="cx"> static void continueAfterPingLoader(Frame&, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse&);
</span><span class="cx"> static void markResourceAsCached(Page&, unsigned long identifier);
</span><span class="cx"> static void didLoadResourceFromMemoryCache(Page&, DocumentLoader*, CachedResource*);
</span><del>- static InspectorInstrumentationCookie willReceiveResourceData(Frame*, unsigned long identifier, int length);
- static void didReceiveResourceData(const InspectorInstrumentationCookie&);
- static InspectorInstrumentationCookie willReceiveResourceResponse(Frame*, unsigned long identifier, const ResourceResponse&);
</del><ins>+ static InspectorInstrumentationCookie willReceiveResourceResponse(Frame*);
</ins><span class="cx"> static void didReceiveResourceResponse(const InspectorInstrumentationCookie&, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*);
</span><span class="cx"> static void continueAfterXFrameOptionsDenied(Frame*, DocumentLoader&, unsigned long identifier, const ResourceResponse&);
</span><span class="cx"> static void continueWithPolicyDownload(Frame*, DocumentLoader&, unsigned long identifier, const ResourceResponse&);
</span><span class="lines">@@ -336,7 +333,6 @@
</span><span class="cx"> static bool forcePseudoStateImpl(InstrumentingAgents&, Element&, CSSSelector::PseudoClassType);
</span><span class="cx">
</span><span class="cx"> static void willSendXMLHttpRequestImpl(InstrumentingAgents&, const String& url);
</span><del>- static void didScheduleResourceRequestImpl(InstrumentingAgents&, const String& url, Frame*);
</del><span class="cx"> static void didInstallTimerImpl(InstrumentingAgents&, int timerId, int timeout, bool singleShot, ScriptExecutionContext*);
</span><span class="cx"> static void didRemoveTimerImpl(InstrumentingAgents&, int timerId, ScriptExecutionContext*);
</span><span class="cx">
</span><span class="lines">@@ -374,9 +370,7 @@
</span><span class="cx"> static void continueAfterPingLoaderImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse&);
</span><span class="cx"> static void markResourceAsCachedImpl(InstrumentingAgents&, unsigned long identifier);
</span><span class="cx"> static void didLoadResourceFromMemoryCacheImpl(InstrumentingAgents&, DocumentLoader*, CachedResource*);
</span><del>- static InspectorInstrumentationCookie willReceiveResourceDataImpl(InstrumentingAgents&, Frame*, unsigned long identifier, int length);
- static void didReceiveResourceDataImpl(const InspectorInstrumentationCookie&);
- static InspectorInstrumentationCookie willReceiveResourceResponseImpl(InstrumentingAgents&, Frame*, unsigned long identifier, const ResourceResponse&);
</del><ins>+ static InspectorInstrumentationCookie willReceiveResourceResponseImpl(InstrumentingAgents&);
</ins><span class="cx"> static void didReceiveResourceResponseImpl(const InspectorInstrumentationCookie&, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*);
</span><span class="cx"> static void didReceiveResourceResponseButCanceledImpl(Frame*, DocumentLoader&, unsigned long identifier, const ResourceResponse&);
</span><span class="cx"> static void continueAfterXFrameOptionsDeniedImpl(Frame*, DocumentLoader&, unsigned long identifier, const ResourceResponse&);
</span><span class="lines">@@ -805,18 +799,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::didScheduleResourceRequest(Document* document, const String& url)
-{
-#if ENABLE(INSPECTOR)
- FAST_RETURN_IF_NO_FRONTENDS(void());
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForDocument(document))
- didScheduleResourceRequestImpl(*instrumentingAgents, url, document->frame());
-#else
- UNUSED_PARAM(document);
- UNUSED_PARAM(url);
-#endif
-}
-
</del><span class="cx"> inline void InspectorInstrumentation::didInstallTimer(ScriptExecutionContext* context, int timerId, int timeout, bool singleShot)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="lines">@@ -1242,39 +1224,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceData(Frame* frame, unsigned long identifier, int length)
</del><ins>+inline InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceResponse(Frame* frame)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- FAST_RETURN_IF_NO_FRONTENDS(InspectorInstrumentationCookie());
</del><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
</span><del>- return willReceiveResourceDataImpl(*instrumentingAgents, frame, identifier, length);
</del><ins>+ return willReceiveResourceResponseImpl(*instrumentingAgents);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(frame);
</span><span class="cx"> UNUSED_PARAM(identifier);
</span><del>- UNUSED_PARAM(length);
-#endif
- return InspectorInstrumentationCookie();
-}
-
-inline void InspectorInstrumentation::didReceiveResourceData(const InspectorInstrumentationCookie& cookie)
-{
-#if ENABLE(INSPECTOR)
- FAST_RETURN_IF_NO_FRONTENDS(void());
- if (cookie.isValid())
- didReceiveResourceDataImpl(cookie);
-#else
- UNUSED_PARAM(cookie);
-#endif
-}
-
-inline InspectorInstrumentationCookie InspectorInstrumentation::willReceiveResourceResponse(Frame* frame, unsigned long identifier, const ResourceResponse& response)
-{
-#if ENABLE(INSPECTOR)
- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
- return willReceiveResourceResponseImpl(*instrumentingAgents, frame, identifier, response);
-#else
- UNUSED_PARAM(frame);
- UNUSED_PARAM(identifier);
</del><span class="cx"> UNUSED_PARAM(response);
</span><span class="cx"> #endif
</span><span class="cx"> return InspectorInstrumentationCookie();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -439,44 +439,6 @@
</span><span class="cx"> didCompleteCurrentRecord(TimelineRecordType::EvaluateScript);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorTimelineAgent::didScheduleResourceRequest(const String& url, Frame* frame)
-{
- appendRecord(TimelineRecordFactory::createScheduleResourceRequestData(url), TimelineRecordType::ScheduleResourceRequest, true, frame);
-}
-
-void InspectorTimelineAgent::willSendResourceRequest(unsigned long identifier, const ResourceRequest& request, Frame* frame)
-{
- String requestId = IdentifiersFactory::requestId(identifier);
- appendRecord(TimelineRecordFactory::createResourceSendRequestData(requestId, request), TimelineRecordType::ResourceSendRequest, true, frame);
-}
-
-void InspectorTimelineAgent::willReceiveResourceData(unsigned long identifier, Frame* frame, int length)
-{
- String requestId = IdentifiersFactory::requestId(identifier);
- pushCurrentRecord(TimelineRecordFactory::createReceiveResourceData(requestId, length), TimelineRecordType::ResourceReceivedData, false, frame);
-}
-
-void InspectorTimelineAgent::didReceiveResourceData()
-{
- didCompleteCurrentRecord(TimelineRecordType::ResourceReceivedData);
-}
-
-void InspectorTimelineAgent::willReceiveResourceResponse(unsigned long identifier, const ResourceResponse& response, Frame* frame)
-{
- String requestId = IdentifiersFactory::requestId(identifier);
- pushCurrentRecord(TimelineRecordFactory::createResourceReceiveResponseData(requestId, response), TimelineRecordType::ResourceReceiveResponse, false, frame);
-}
-
-void InspectorTimelineAgent::didReceiveResourceResponse()
-{
- didCompleteCurrentRecord(TimelineRecordType::ResourceReceiveResponse);
-}
-
-void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier, bool didFail, double finishTime, Frame* frame)
-{
- appendRecord(TimelineRecordFactory::createResourceFinishData(IdentifiersFactory::requestId(identifier), didFail, finishTime * 1000), TimelineRecordType::ResourceFinish, false, frame);
-}
-
</del><span class="cx"> void InspectorTimelineAgent::didTimeStamp(Frame& frame, const String& message)
</span><span class="cx"> {
</span><span class="cx"> appendRecord(TimelineRecordFactory::createTimeStampData(message), TimelineRecordType::TimeStamp, true, &frame);
</span><span class="lines">@@ -604,17 +566,6 @@
</span><span class="cx"> case TimelineRecordType::TimeEnd:
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::TimeEnd;
</span><span class="cx">
</span><del>- case TimelineRecordType::ScheduleResourceRequest:
- return Inspector::Protocol::Timeline::EventType::ScheduleResourceRequest;
- case TimelineRecordType::ResourceSendRequest:
- return Inspector::Protocol::Timeline::EventType::ResourceSendRequest;
- case TimelineRecordType::ResourceReceiveResponse:
- return Inspector::Protocol::Timeline::EventType::ResourceReceiveResponse;
- case TimelineRecordType::ResourceReceivedData:
- return Inspector::Protocol::Timeline::EventType::ResourceReceivedData;
- case TimelineRecordType::ResourceFinish:
- return Inspector::Protocol::Timeline::EventType::ResourceFinish;
-
</del><span class="cx"> case TimelineRecordType::XHRReadyStateChange:
</span><span class="cx"> return Inspector::Protocol::Timeline::EventType::XHRReadyStateChange;
</span><span class="cx"> case TimelineRecordType::XHRLoad:
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -91,12 +91,6 @@
</span><span class="cx"> Time,
</span><span class="cx"> TimeEnd,
</span><span class="cx">
</span><del>- ScheduleResourceRequest,
- ResourceSendRequest,
- ResourceReceiveResponse,
- ResourceReceivedData,
- ResourceFinish,
-
</del><span class="cx"> XHRReadyStateChange,
</span><span class="cx"> XHRLoad,
</span><span class="cx">
</span><span class="lines">@@ -143,7 +137,6 @@
</span><span class="cx"> PassRefPtr<JSC::Profile> stopFromConsole(JSC::ExecState*, const String& title);
</span><span class="cx">
</span><span class="cx"> // InspectorInstrumentation callbacks.
</span><del>- void didScheduleResourceRequest(const String& url, Frame*);
</del><span class="cx"> void didInstallTimer(int timerId, int timeout, bool singleShot, Frame*);
</span><span class="cx"> void didRemoveTimer(int timerId, Frame*);
</span><span class="cx"> void willFireTimer(int timerId, Frame*);
</span><span class="lines">@@ -173,12 +166,6 @@
</span><span class="cx"> void didTimeStamp(Frame&, const String&);
</span><span class="cx"> void didMarkDOMContentEvent(Frame&);
</span><span class="cx"> void didMarkLoadEvent(Frame&);
</span><del>- void willSendResourceRequest(unsigned long, const ResourceRequest&, Frame*);
- void willReceiveResourceResponse(unsigned long, const ResourceResponse&, Frame*);
- void didReceiveResourceResponse();
- void didFinishLoadingResource(unsigned long, bool didFail, double finishTime, Frame*);
- void willReceiveResourceData(unsigned long identifier, Frame*, int length);
- void didReceiveResourceData();
</del><span class="cx"> void didRequestAnimationFrame(int callbackId, Frame*);
</span><span class="cx"> void didCancelAnimationFrame(int callbackId, Frame*);
</span><span class="cx"> void willFireAnimationFrame(int callbackId, Frame*);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -156,49 +156,6 @@
</span><span class="cx"> return WTF::move(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<InspectorObject> TimelineRecordFactory::createScheduleResourceRequestData(const String& url)
-{
- Ref<InspectorObject> data = InspectorObject::create();
- data->setString("url", url);
- return WTF::move(data);
-}
-
-Ref<InspectorObject> TimelineRecordFactory::createResourceSendRequestData(const String& requestId, const ResourceRequest& request)
-{
- Ref<InspectorObject> data = InspectorObject::create();
- data->setString("requestId", requestId);
- data->setString("url", request.url().string());
- data->setString("requestMethod", request.httpMethod());
- return WTF::move(data);
-}
-
-Ref<InspectorObject> TimelineRecordFactory::createResourceReceiveResponseData(const String& requestId, const ResourceResponse& response)
-{
- Ref<InspectorObject> data = InspectorObject::create();
- data->setString("requestId", requestId);
- data->setInteger("statusCode", response.httpStatusCode());
- data->setString("mimeType", response.mimeType());
- return WTF::move(data);
-}
-
-Ref<InspectorObject> TimelineRecordFactory::createResourceFinishData(const String& requestId, bool didFail, double finishTime)
-{
- Ref<InspectorObject> data = InspectorObject::create();
- data->setString("requestId", requestId);
- data->setBoolean("didFail", didFail);
- if (finishTime)
- data->setDouble("networkTime", finishTime);
- return WTF::move(data);
-}
-
-Ref<InspectorObject> TimelineRecordFactory::createReceiveResourceData(const String& requestId, int length)
-{
- Ref<InspectorObject> data = InspectorObject::create();
- data->setString("requestId", requestId);
- data->setInteger("encodedDataLength", length);
- return WTF::move(data);
-}
-
</del><span class="cx"> Ref<InspectorObject> TimelineRecordFactory::createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout)
</span><span class="cx"> {
</span><span class="cx"> Ref<InspectorObject> data = InspectorObject::create();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorTimelineRecordFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.h (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -79,16 +79,6 @@
</span><span class="cx">
</span><span class="cx"> static Ref<Inspector::InspectorObject> createTimeStampData(const String&);
</span><span class="cx">
</span><del>- static Ref<Inspector::InspectorObject> createResourceSendRequestData(const String& requestId, const ResourceRequest&);
-
- static Ref<Inspector::InspectorObject> createScheduleResourceRequestData(const String&);
-
- static Ref<Inspector::InspectorObject> createResourceReceiveResponseData(const String& requestId, const ResourceResponse&);
-
- static Ref<Inspector::InspectorObject> createReceiveResourceData(const String& requestId, int length);
-
- static Ref<Inspector::InspectorObject> createResourceFinishData(const String& requestId, bool didFail, double finishTime);
-
</del><span class="cx"> static Ref<Inspector::InspectorObject> createLayoutData(unsigned dirtyObjects, unsigned totalObjects, bool partialLayout);
</span><span class="cx">
</span><span class="cx"> static Ref<Inspector::InspectorObject> createDecodeImageData(const String& imageType);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> if (m_actualRequest) {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> DocumentLoader* loader = m_document.frame()->loader().documentLoader();
</span><del>- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_document.frame(), identifier, response);
</del><ins>+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_document.frame());
</ins><span class="cx"> InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, loader, response, 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadNotifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceLoadNotifier::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r, ResourceLoader* resourceLoader)
</span><span class="cx"> {
</span><del>- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(&m_frame, identifier, r);
</del><ins>+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(&m_frame);
</ins><span class="cx"> m_frame.loader().client().dispatchDidReceiveResponse(loader, identifier, r);
</span><span class="cx"> InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, loader, r, resourceLoader);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -191,18 +191,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- notifyDidScheduleResourceRequest(resourceLoader);
-
</del><span class="cx"> // Handle asynchronously so early low priority requests don't
</span><span class="cx"> // get scheduled before later high priority ones.
</span><span class="cx"> scheduleServePendingRequests();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoadScheduler::notifyDidScheduleResourceRequest(ResourceLoader* loader)
-{
- InspectorInstrumentation::didScheduleResourceRequest(loader->frameLoader() ? loader->frameLoader()->frame().document() : nullptr, loader->url());
-}
-
</del><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> bool ResourceLoadScheduler::maybeLoadQuickLookResource(ResourceLoader& loader)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadScheduler.h (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadScheduler.h 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/loader/ResourceLoadScheduler.h 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -75,8 +75,6 @@
</span><span class="cx"> WEBCORE_EXPORT ResourceLoadScheduler();
</span><span class="cx"> WEBCORE_EXPORT virtual ~ResourceLoadScheduler();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void notifyDidScheduleResourceRequest(ResourceLoader*);
-
</del><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> WEBCORE_EXPORT bool maybeLoadQuickLookResource(ResourceLoader&);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -489,16 +489,12 @@
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::didReceiveData(ResourceHandle*, const char* data, unsigned length, int encodedDataLength)
</span><span class="cx"> {
</span><del>- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceData(m_frame.get(), identifier(), encodedDataLength);
</del><span class="cx"> didReceiveData(data, length, encodedDataLength, DataPayloadBytes);
</span><del>- InspectorInstrumentation::didReceiveResourceData(cookie);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::didReceiveBuffer(ResourceHandle*, PassRefPtr<SharedBuffer> buffer, int encodedDataLength)
</span><span class="cx"> {
</span><del>- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceData(m_frame.get(), identifier(), encodedDataLength);
</del><span class="cx"> didReceiveBuffer(buffer, encodedDataLength, DataPayloadBytes);
</span><del>- InspectorInstrumentation::didReceiveResourceData(cookie);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::didFinishLoading(ResourceHandle*, double finishTime)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> DocumentLoader* loader = (handle == m_manifestHandle) ? nullptr : m_frame->loader().documentLoader();
</span><del>- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_frame, m_currentResourceIdentifier, response);
</del><ins>+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_frame);
</ins><span class="cx"> InspectorInstrumentation::didReceiveResourceResponse(cookie, m_currentResourceIdentifier, loader, response, 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadermacResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -98,11 +98,7 @@
</span><span class="cx"> dataLength += CFDataGetLength(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // FIXME: didReceiveData() passes encoded data length to InspectorInstrumentation, but it is not available here.
- // This probably results in incorrect size being displayed in Web Inspector.
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceData(m_frame.get(), identifier(), dataLength);
</del><span class="cx"> didReceiveDataArray(dataArray);
</span><del>- InspectorInstrumentation::didReceiveResourceData(cookie);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-01-09 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Remove or use TimelineAgent Resource related event types
+ https://bugs.webkit.org/show_bug.cgi?id=140155
+
+ Reviewed by Timothy Hatcher.
+
+ * WebProcess/Network/WebResourceLoadScheduler.cpp:
+ (WebKit::WebResourceLoadScheduler::scheduleLoad):
+
</ins><span class="cx"> 2015-01-09 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix the WebKit2 build with the public SDK
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (178200 => 178201)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-01-09 22:25:31 UTC (rev 178200)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-01-09 22:26:25 UTC (rev 178201)
</span><span class="lines">@@ -188,8 +188,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_webResourceLoaders.set(identifier, WebResourceLoader::create(resourceLoader));
</span><del>-
- notifyDidScheduleResourceRequest(resourceLoader);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadScheduler::scheduleInternallyFailedLoad(WebCore::ResourceLoader* resourceLoader)
</span></span></pre>
</div>
</div>
</body>
</html>