<!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>[128285] trunk/Source/WebCore</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/128285">128285</a></dd>
<dt>Author</dt> <dd>vsevik@chromium.org</dd>
<dt>Date</dt> <dd>2012-09-12 02:57:42 -0700 (Wed, 12 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Web Inspector: XMLHttpRequest instrumentation methods used by timeline should have better names.
https://bugs.webkit.org/show_bug.cgi?id=96486

Reviewed by Alexander Pavlov.

Renamed instrumentation methods.

* inspector/InspectorInstrumentation.cpp:
(WebCore):
(WebCore::InspectorInstrumentation::willDispatchXHRReadyStateChangeEventImpl):
(WebCore::InspectorInstrumentation::didDispatchXHRReadyStateChangeEventImpl):
(WebCore::InspectorInstrumentation::willDispatchXHRLoadEventImpl):
(WebCore::InspectorInstrumentation::didDispatchXHRLoadEventImpl):
* inspector/InspectorInstrumentation.h:
(InspectorInstrumentation):
(WebCore::InspectorInstrumentation::willDispatchXHRReadyStateChangeEvent):
(WebCore::InspectorInstrumentation::didDispatchXHRReadyStateChangeEvent):
(WebCore::InspectorInstrumentation::willDispatchXHRLoadEvent):
(WebCore::InspectorInstrumentation::didDispatchXHRLoadEvent):
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::willDispatchXHRReadyStateChangeEvent):
(WebCore::InspectorTimelineAgent::didDispatchXHRReadyStateChangeEvent):
(WebCore::InspectorTimelineAgent::willDispatchXHRLoadEvent):
(WebCore::InspectorTimelineAgent::didDispatchXHRLoadEvent):
* inspector/InspectorTimelineAgent.h:
(InspectorTimelineAgent):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::callReadyStateChangeListener):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (128284 => 128285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2012-09-12 09:46:32 UTC (rev 128284)
+++ trunk/Source/WebCore/ChangeLog        2012-09-12 09:57:42 UTC (rev 128285)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2012-09-12  Vsevolod Vlasov  &lt;vsevik@chromium.org&gt;
+
+        Web Inspector: XMLHttpRequest instrumentation methods used by timeline should have better names.
+        https://bugs.webkit.org/show_bug.cgi?id=96486
+
+        Reviewed by Alexander Pavlov.
+
+        Renamed instrumentation methods.
+
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore):
+        (WebCore::InspectorInstrumentation::willDispatchXHRReadyStateChangeEventImpl):
+        (WebCore::InspectorInstrumentation::didDispatchXHRReadyStateChangeEventImpl):
+        (WebCore::InspectorInstrumentation::willDispatchXHRLoadEventImpl):
+        (WebCore::InspectorInstrumentation::didDispatchXHRLoadEventImpl):
+        * inspector/InspectorInstrumentation.h:
+        (InspectorInstrumentation):
+        (WebCore::InspectorInstrumentation::willDispatchXHRReadyStateChangeEvent):
+        (WebCore::InspectorInstrumentation::didDispatchXHRReadyStateChangeEvent):
+        (WebCore::InspectorInstrumentation::willDispatchXHRLoadEvent):
+        (WebCore::InspectorInstrumentation::didDispatchXHRLoadEvent):
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::willDispatchXHRReadyStateChangeEvent):
+        (WebCore::InspectorTimelineAgent::didDispatchXHRReadyStateChangeEvent):
+        (WebCore::InspectorTimelineAgent::willDispatchXHRLoadEvent):
+        (WebCore::InspectorTimelineAgent::didDispatchXHRLoadEvent):
+        * inspector/InspectorTimelineAgent.h:
+        (InspectorTimelineAgent):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::callReadyStateChangeListener):
+
</ins><span class="cx"> 2012-09-12  Sheriff Bot  &lt;webkit.review.bot@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r128279.
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (128284 => 128285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp        2012-09-12 09:46:32 UTC (rev 128284)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp        2012-09-12 09:57:42 UTC (rev 128285)
</span><span class="lines">@@ -319,21 +319,21 @@
</span><span class="cx">         timelineAgent-&gt;didCallFunction();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-InspectorInstrumentationCookie InspectorInstrumentation::willChangeXHRReadyStateImpl(InstrumentingAgents* instrumentingAgents, XMLHttpRequest* request, ScriptExecutionContext* context)
</del><ins>+InspectorInstrumentationCookie InspectorInstrumentation::willDispatchXHRReadyStateChangeEventImpl(InstrumentingAgents* instrumentingAgents, XMLHttpRequest* request, ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx">     int timelineAgentId = 0;
</span><span class="cx">     InspectorTimelineAgent* timelineAgent = instrumentingAgents-&gt;inspectorTimelineAgent();
</span><span class="cx">     if (timelineAgent &amp;&amp; request-&gt;hasEventListeners(eventNames().readystatechangeEvent)) {
</span><del>-        timelineAgent-&gt;willChangeXHRReadyState(request-&gt;url().string(), request-&gt;readyState(), frameForScriptExecutionContext(context));
</del><ins>+        timelineAgent-&gt;willDispatchXHRReadyStateChangeEvent(request-&gt;url().string(), request-&gt;readyState(), frameForScriptExecutionContext(context));
</ins><span class="cx">         timelineAgentId = timelineAgent-&gt;id();
</span><span class="cx">     }
</span><span class="cx">     return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorInstrumentation::didChangeXHRReadyStateImpl(const InspectorInstrumentationCookie&amp; cookie)
</del><ins>+void InspectorInstrumentation::didDispatchXHRReadyStateChangeEventImpl(const InspectorInstrumentationCookie&amp; cookie)
</ins><span class="cx"> {
</span><span class="cx">     if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
</span><del>-        timelineAgent-&gt;didChangeXHRReadyState();
</del><ins>+        timelineAgent-&gt;didDispatchXHRReadyStateChangeEvent();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> InspectorInstrumentationCookie InspectorInstrumentation::willDispatchEventImpl(InstrumentingAgents* instrumentingAgents, const Event&amp; event, DOMWindow* window, Node* node, const Vector&lt;EventContext&gt;&amp; ancestors, Document* document)
</span><span class="lines">@@ -463,21 +463,21 @@
</span><span class="cx">         pageAgent-&gt;didLayout();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-InspectorInstrumentationCookie InspectorInstrumentation::willLoadXHRImpl(InstrumentingAgents* instrumentingAgents, XMLHttpRequest* request, ScriptExecutionContext* context)
</del><ins>+InspectorInstrumentationCookie InspectorInstrumentation::willDispatchXHRLoadEventImpl(InstrumentingAgents* instrumentingAgents, XMLHttpRequest* request, ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx">     int timelineAgentId = 0;
</span><span class="cx">     InspectorTimelineAgent* timelineAgent = instrumentingAgents-&gt;inspectorTimelineAgent();
</span><span class="cx">     if (timelineAgent &amp;&amp; request-&gt;hasEventListeners(eventNames().loadEvent)) {
</span><del>-        timelineAgent-&gt;willLoadXHR(request-&gt;url(), frameForScriptExecutionContext(context));
</del><ins>+        timelineAgent-&gt;willDispatchXHRLoadEvent(request-&gt;url(), frameForScriptExecutionContext(context));
</ins><span class="cx">         timelineAgentId = timelineAgent-&gt;id();
</span><span class="cx">     }
</span><span class="cx">     return InspectorInstrumentationCookie(instrumentingAgents, timelineAgentId);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorInstrumentation::didLoadXHRImpl(const InspectorInstrumentationCookie&amp; cookie)
</del><ins>+void InspectorInstrumentation::didDispatchXHRLoadEventImpl(const InspectorInstrumentationCookie&amp; cookie)
</ins><span class="cx"> {
</span><span class="cx">     if (InspectorTimelineAgent* timelineAgent = retrieveTimelineAgent(cookie))
</span><del>-        timelineAgent-&gt;didLoadXHR();
</del><ins>+        timelineAgent-&gt;didDispatchXHRLoadEvent();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> InspectorInstrumentationCookie InspectorInstrumentation::willPaintImpl(InstrumentingAgents* instrumentingAgents, GraphicsContext* context, const LayoutRect&amp; rect, Frame* frame)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (128284 => 128285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h        2012-09-12 09:46:32 UTC (rev 128284)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h        2012-09-12 09:57:42 UTC (rev 128285)
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> 
</span><span class="cx">     static InspectorInstrumentationCookie willCallFunction(ScriptExecutionContext*, const String&amp; scriptName, int scriptLine);
</span><span class="cx">     static void didCallFunction(const InspectorInstrumentationCookie&amp;);
</span><del>-    static InspectorInstrumentationCookie willChangeXHRReadyState(ScriptExecutionContext*, XMLHttpRequest* request);
-    static void didChangeXHRReadyState(const InspectorInstrumentationCookie&amp;);
</del><ins>+    static InspectorInstrumentationCookie willDispatchXHRReadyStateChangeEvent(ScriptExecutionContext*, XMLHttpRequest*);
+    static void didDispatchXHRReadyStateChangeEvent(const InspectorInstrumentationCookie&amp;);
</ins><span class="cx">     static InspectorInstrumentationCookie willDispatchEvent(Document*, const Event&amp; event, DOMWindow* window, Node* node, const Vector&lt;EventContext&gt;&amp; ancestors);
</span><span class="cx">     static void didDispatchEvent(const InspectorInstrumentationCookie&amp;);
</span><span class="cx">     static InspectorInstrumentationCookie willHandleEvent(ScriptExecutionContext*, Event*);
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx">     static InspectorInstrumentationCookie willLayout(Frame*);
</span><span class="cx">     static void didLayout(const InspectorInstrumentationCookie&amp;, RenderObject*);
</span><span class="cx">     static void didScroll(Page*);
</span><del>-    static InspectorInstrumentationCookie willLoadXHR(ScriptExecutionContext*, XMLHttpRequest*);
-    static void didLoadXHR(const InspectorInstrumentationCookie&amp;);
</del><ins>+    static InspectorInstrumentationCookie willDispatchXHRLoadEvent(ScriptExecutionContext*, XMLHttpRequest*);
+    static void didDispatchXHRLoadEvent(const InspectorInstrumentationCookie&amp;);
</ins><span class="cx">     static InspectorInstrumentationCookie willPaint(Frame*, GraphicsContext*, const LayoutRect&amp;);
</span><span class="cx">     static void didPaint(const InspectorInstrumentationCookie&amp;);
</span><span class="cx">     static void willComposite(Page*);
</span><span class="lines">@@ -305,8 +305,8 @@
</span><span class="cx"> 
</span><span class="cx">     static InspectorInstrumentationCookie willCallFunctionImpl(InstrumentingAgents*, const String&amp; scriptName, int scriptLine, ScriptExecutionContext*);
</span><span class="cx">     static void didCallFunctionImpl(const InspectorInstrumentationCookie&amp;);
</span><del>-    static InspectorInstrumentationCookie willChangeXHRReadyStateImpl(InstrumentingAgents*, XMLHttpRequest*, ScriptExecutionContext*);
-    static void didChangeXHRReadyStateImpl(const InspectorInstrumentationCookie&amp;);
</del><ins>+    static InspectorInstrumentationCookie willDispatchXHRReadyStateChangeEventImpl(InstrumentingAgents*, XMLHttpRequest*, ScriptExecutionContext*);
+    static void didDispatchXHRReadyStateChangeEventImpl(const InspectorInstrumentationCookie&amp;);
</ins><span class="cx">     static InspectorInstrumentationCookie willDispatchEventImpl(InstrumentingAgents*, const Event&amp;, DOMWindow*, Node*, const Vector&lt;EventContext&gt;&amp; ancestors, Document*);
</span><span class="cx">     static InspectorInstrumentationCookie willHandleEventImpl(InstrumentingAgents*, Event*);
</span><span class="cx">     static void didHandleEventImpl(const InspectorInstrumentationCookie&amp;);
</span><span class="lines">@@ -324,8 +324,8 @@
</span><span class="cx">     static InspectorInstrumentationCookie willLayoutImpl(InstrumentingAgents*, Frame*);
</span><span class="cx">     static void didLayoutImpl(const InspectorInstrumentationCookie&amp;, RenderObject*);
</span><span class="cx">     static void didScrollImpl(InstrumentingAgents*);
</span><del>-    static InspectorInstrumentationCookie willLoadXHRImpl(InstrumentingAgents*, XMLHttpRequest*, ScriptExecutionContext*);
-    static void didLoadXHRImpl(const InspectorInstrumentationCookie&amp;);
</del><ins>+    static InspectorInstrumentationCookie willDispatchXHRLoadEventImpl(InstrumentingAgents*, XMLHttpRequest*, ScriptExecutionContext*);
+    static void didDispatchXHRLoadEventImpl(const InspectorInstrumentationCookie&amp;);
</ins><span class="cx">     static InspectorInstrumentationCookie willPaintImpl(InstrumentingAgents*, GraphicsContext*, const LayoutRect&amp;, Frame*);
</span><span class="cx">     static void didPaintImpl(const InspectorInstrumentationCookie&amp;);
</span><span class="cx">     static void willCompositeImpl(InstrumentingAgents*);
</span><span class="lines">@@ -674,22 +674,22 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline InspectorInstrumentationCookie InspectorInstrumentation::willChangeXHRReadyState(ScriptExecutionContext* context, XMLHttpRequest* request)
</del><ins>+inline InspectorInstrumentationCookie InspectorInstrumentation::willDispatchXHRReadyStateChangeEvent(ScriptExecutionContext* context, XMLHttpRequest* request)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">     FAST_RETURN_IF_NO_FRONTENDS(InspectorInstrumentationCookie());
</span><span class="cx">     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
</span><del>-        return willChangeXHRReadyStateImpl(instrumentingAgents, request, context);
</del><ins>+        return willDispatchXHRReadyStateChangeEventImpl(instrumentingAgents, request, context);
</ins><span class="cx"> #endif
</span><span class="cx">     return InspectorInstrumentationCookie();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline void InspectorInstrumentation::didChangeXHRReadyState(const InspectorInstrumentationCookie&amp; cookie)
</del><ins>+inline void InspectorInstrumentation::didDispatchXHRReadyStateChangeEvent(const InspectorInstrumentationCookie&amp; cookie)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">     FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx">     if (cookie.first)
</span><del>-        didChangeXHRReadyStateImpl(cookie);
</del><ins>+        didDispatchXHRReadyStateChangeEventImpl(cookie);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -852,22 +852,22 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline InspectorInstrumentationCookie InspectorInstrumentation::willLoadXHR(ScriptExecutionContext* context, XMLHttpRequest* request)
</del><ins>+inline InspectorInstrumentationCookie InspectorInstrumentation::willDispatchXHRLoadEvent(ScriptExecutionContext* context, XMLHttpRequest* request)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">     FAST_RETURN_IF_NO_FRONTENDS(InspectorInstrumentationCookie());
</span><span class="cx">     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
</span><del>-        return willLoadXHRImpl(instrumentingAgents, request, context);
</del><ins>+        return willDispatchXHRLoadEventImpl(instrumentingAgents, request, context);
</ins><span class="cx"> #endif
</span><span class="cx">     return InspectorInstrumentationCookie();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-inline void InspectorInstrumentation::didLoadXHR(const InspectorInstrumentationCookie&amp; cookie)
</del><ins>+inline void InspectorInstrumentation::didDispatchXHRLoadEvent(const InspectorInstrumentationCookie&amp; cookie)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">     FAST_RETURN_IF_NO_FRONTENDS(void());
</span><span class="cx">     if (cookie.first)
</span><del>-        didLoadXHRImpl(cookie);
</del><ins>+        didDispatchXHRLoadEventImpl(cookie);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (128284 => 128285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp        2012-09-12 09:46:32 UTC (rev 128284)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp        2012-09-12 09:57:42 UTC (rev 128285)
</span><span class="lines">@@ -344,22 +344,22 @@
</span><span class="cx">     didCompleteCurrentRecord(TimelineRecordType::TimerFire);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorTimelineAgent::willChangeXHRReadyState(const String&amp; url, int readyState, Frame* frame)
</del><ins>+void InspectorTimelineAgent::willDispatchXHRReadyStateChangeEvent(const String&amp; url, int readyState, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx">     pushCurrentRecord(TimelineRecordFactory::createXHRReadyStateChangeData(url, readyState), TimelineRecordType::XHRReadyStateChange, false, frame);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorTimelineAgent::didChangeXHRReadyState()
</del><ins>+void InspectorTimelineAgent::didDispatchXHRReadyStateChangeEvent()
</ins><span class="cx"> {
</span><span class="cx">     didCompleteCurrentRecord(TimelineRecordType::XHRReadyStateChange);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorTimelineAgent::willLoadXHR(const String&amp; url, Frame* frame)
</del><ins>+void InspectorTimelineAgent::willDispatchXHRLoadEvent(const String&amp; url, Frame* frame)
</ins><span class="cx"> {
</span><span class="cx">     pushCurrentRecord(TimelineRecordFactory::createXHRLoadData(url), TimelineRecordType::XHRLoad, true, frame);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void InspectorTimelineAgent::didLoadXHR()
</del><ins>+void InspectorTimelineAgent::didDispatchXHRLoadEvent()
</ins><span class="cx"> {
</span><span class="cx">     didCompleteCurrentRecord(TimelineRecordType::XHRLoad);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorTimelineAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (128284 => 128285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h        2012-09-12 09:46:32 UTC (rev 128284)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h        2012-09-12 09:57:42 UTC (rev 128285)
</span><span class="lines">@@ -121,10 +121,10 @@
</span><span class="cx">     void willFireTimer(int timerId, Frame*);
</span><span class="cx">     void didFireTimer();
</span><span class="cx"> 
</span><del>-    void willChangeXHRReadyState(const String&amp;, int, Frame*);
-    void didChangeXHRReadyState();
-    void willLoadXHR(const String&amp;, Frame*);
-    void didLoadXHR();
</del><ins>+    void willDispatchXHRReadyStateChangeEvent(const String&amp;, int, Frame*);
+    void didDispatchXHRReadyStateChangeEvent();
+    void willDispatchXHRLoadEvent(const String&amp;, Frame*);
+    void didDispatchXHRLoadEvent();
</ins><span class="cx"> 
</span><span class="cx">     void willEvaluateScript(const String&amp;, int, Frame*);
</span><span class="cx">     void didEvaluateScript();
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (128284 => 128285)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp        2012-09-12 09:46:32 UTC (rev 128284)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp        2012-09-12 09:57:42 UTC (rev 128285)
</span><span class="lines">@@ -394,17 +394,16 @@
</span><span class="cx">     if (!scriptExecutionContext())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willChangeXHRReadyState(scriptExecutionContext(), this);
</del><ins>+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willDispatchXHRReadyStateChangeEvent(scriptExecutionContext(), this);
</ins><span class="cx"> 
</span><span class="cx">     if (m_async || (m_state &lt;= OPENED || m_state == DONE))
</span><span class="cx">         m_progressEventThrottle.dispatchReadyStateChangeEvent(XMLHttpRequestProgressEvent::create(eventNames().readystatechangeEvent), m_state == DONE ? FlushProgressEvent : DoNotFlushProgressEvent);
</span><span class="cx"> 
</span><del>-    InspectorInstrumentation::didChangeXHRReadyState(cookie);
-
</del><ins>+    InspectorInstrumentation::didDispatchXHRReadyStateChangeEvent(cookie);
</ins><span class="cx">     if (m_state == DONE &amp;&amp; !m_error) {
</span><del>-        InspectorInstrumentationCookie cookie = InspectorInstrumentation::willLoadXHR(scriptExecutionContext(), this);
</del><ins>+        InspectorInstrumentationCookie cookie = InspectorInstrumentation::willDispatchXHRLoadEvent(scriptExecutionContext(), this);
</ins><span class="cx">         m_progressEventThrottle.dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().loadEvent));
</span><del>-        InspectorInstrumentation::didLoadXHR(cookie);
</del><ins>+        InspectorInstrumentation::didDispatchXHRLoadEvent(cookie);
</ins><span class="cx">         m_progressEventThrottle.dispatchEvent(XMLHttpRequestProgressEvent::create(eventNames().loadendEvent));
</span><span class="cx">     }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>