[webkit-changes] [209169] trunk/Source/WebCore

Wed, 30 Nov 2016 19:16:38 -0800

Title: [209169] trunk/Source/WebCore
Revision
209169
Author
commit-qu...@webkit.org
Date
2016-11-30 19:16:13 -0800 (Wed, 30 Nov 2016)

Log Message

Web Inspector: Remove unused parameter of InspectorInstrumentation::didFinishXHRLoading
https://bugs.webkit.org/show_bug.cgi?id=165233

Patch by Joseph Pecoraro <pecor...@apple.com> on 2016-11-30
Reviewed by Brian Burg.

* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didFinishXHRLoadingImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didFinishXHRLoading):
* inspector/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::didFinishXHRLoading):
* inspector/InspectorNetworkAgent.h:
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::didFinishLoading):
Remove unused ThreadableLoaderClient parameter.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (209168 => 209169)


--- trunk/Source/WebCore/ChangeLog	2016-12-01 02:42:28 UTC (rev 209168)
+++ trunk/Source/WebCore/ChangeLog	2016-12-01 03:16:13 UTC (rev 209169)
@@ -1,3 +1,21 @@
+2016-11-30  Joseph Pecoraro  <pecor...@apple.com>
+
+        Web Inspector: Remove unused parameter of InspectorInstrumentation::didFinishXHRLoading
+        https://bugs.webkit.org/show_bug.cgi?id=165233
+
+        Reviewed by Brian Burg.
+
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didFinishXHRLoadingImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::didFinishXHRLoading):
+        * inspector/InspectorNetworkAgent.cpp:
+        (WebCore::InspectorNetworkAgent::didFinishXHRLoading):
+        * inspector/InspectorNetworkAgent.h:
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::didFinishLoading):
+        Remove unused ThreadableLoaderClient parameter.
+
 2016-11-30  Brady Eidson  <beid...@apple.com>
 
         IndexedDB: When doing puts, don't "updateAllIndexesForAddRecord" if there are no indexes.

Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (209168 => 209169)


--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp	2016-12-01 02:42:28 UTC (rev 209168)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp	2016-12-01 03:16:13 UTC (rev 209169)
@@ -659,13 +659,13 @@
         consoleAgent->didFailLoading(identifier, error); // This should come AFTER resource notification, front-end relies on this.
 }
 
-void InspectorInstrumentation::didFinishXHRLoadingImpl(InstrumentingAgents& instrumentingAgents, ThreadableLoaderClient* client, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
+void InspectorInstrumentation::didFinishXHRLoadingImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
 {
     if (WebConsoleAgent* consoleAgent = instrumentingAgents.webConsoleAgent())
         consoleAgent->didFinishXHRLoading(identifier, url, sendURL, sendLineNumber, sendColumnNumber);
     if (InspectorNetworkAgent* networkAgent = instrumentingAgents.inspectorNetworkAgent()) {
         if (decodedText)
-            networkAgent->didFinishXHRLoading(client, identifier, *decodedText);
+            networkAgent->didFinishXHRLoading(identifier, *decodedText);
     }
 }

Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (209168 => 209169)


--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h	2016-12-01 02:42:28 UTC (rev 209168)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h	2016-12-01 03:16:13 UTC (rev 209169)
@@ -78,7 +78,6 @@
 class ResourceResponse;
 class SecurityOrigin;
 class ShadowRoot;
-class ThreadableLoaderClient;
 class URL;
 class WebKitNamedFlow;
 class WorkerInspectorProxy;
@@ -163,7 +162,7 @@
     static void didReceiveData(Frame*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
     static void didFinishLoading(Frame*, DocumentLoader*, unsigned long identifier, double finishTime);
     static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier, const ResourceError&);
-    static void didFinishXHRLoading(ScriptExecutionContext*, ThreadableLoaderClient*, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
+    static void didFinishXHRLoading(ScriptExecutionContext*, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
     static void didReceiveXHRResponse(ScriptExecutionContext*, unsigned long identifier);
     static void willLoadXHRSynchronously(ScriptExecutionContext*);
     static void didLoadXHRSynchronously(ScriptExecutionContext*);
@@ -291,8 +290,8 @@
     static void didUnregisterNamedFlowContentElementImpl(InstrumentingAgents&, Document&, WebKitNamedFlow&, Node& contentElement);
 
     static void mouseDidMoveOverElementImpl(InstrumentingAgents&, const HitTestResult&, unsigned modifierFlags);
+    static bool handleMousePressImpl(InstrumentingAgents&);
     static bool handleTouchEventImpl(InstrumentingAgents&, Node&);
-    static bool handleMousePressImpl(InstrumentingAgents&);
     static bool forcePseudoStateImpl(InstrumentingAgents&, const Element&, CSSSelector::PseudoClassType);
 
     static void willSendXMLHttpRequestImpl(InstrumentingAgents&, const String& url);
@@ -337,9 +336,7 @@
     static void didReceiveDataImpl(InstrumentingAgents&, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
     static void didFinishLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, double finishTime);
     static void didFailLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const ResourceError&);
-    static void willLoadXHRImpl(InstrumentingAgents&, ThreadableLoaderClient*, const String&, const URL&, bool, RefPtr<FormData>&&, const HTTPHeaderMap&, bool);
-    static void didFailXHRLoadingImpl(InstrumentingAgents&, ThreadableLoaderClient*);
-    static void didFinishXHRLoadingImpl(InstrumentingAgents&, ThreadableLoaderClient*, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
+    static void didFinishXHRLoadingImpl(InstrumentingAgents&, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
     static void didReceiveXHRResponseImpl(InstrumentingAgents&, unsigned long identifier);
     static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&);
     static void didLoadXHRSynchronouslyImpl(InstrumentingAgents&);
@@ -914,10 +911,10 @@
         didFailLoadingImpl(*instrumentingAgents, identifier, loader, error);
 }
 
-inline void InspectorInstrumentation::didFinishXHRLoading(ScriptExecutionContext* context, ThreadableLoaderClient* client, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
+inline void InspectorInstrumentation::didFinishXHRLoading(ScriptExecutionContext* context, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber)
 {
     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForContext(context))
-        didFinishXHRLoadingImpl(*instrumentingAgents, client, identifier, decodedText, url, sendURL, sendLineNumber, sendColumnNumber);
+        didFinishXHRLoadingImpl(*instrumentingAgents, identifier, decodedText, url, sendURL, sendLineNumber, sendColumnNumber);
 }
 
 inline void InspectorInstrumentation::didReceiveXHRResponse(ScriptExecutionContext* context, unsigned long identifier)

Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (209168 => 209169)


--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp	2016-12-01 02:42:28 UTC (rev 209168)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp	2016-12-01 03:16:13 UTC (rev 209169)
@@ -450,7 +450,7 @@
     m_resourcesData->setResourceType(IdentifiersFactory::requestId(identifier), InspectorPageAgent::ScriptResource);
 }
 
-void InspectorNetworkAgent::didFinishXHRLoading(ThreadableLoaderClient*, unsigned long identifier, const String& decodedText)
+void InspectorNetworkAgent::didFinishXHRLoading(unsigned long identifier, const String& decodedText)
 {
     m_resourcesData->setResourceContent(IdentifiersFactory::requestId(identifier), decodedText);
 }

Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.h (209168 => 209169)


--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.h	2016-12-01 02:42:28 UTC (rev 209168)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.h	2016-12-01 03:16:13 UTC (rev 209169)
@@ -54,7 +54,6 @@
 class ResourceLoader;
 class ResourceRequest;
 class ResourceResponse;
-class ThreadableLoaderClient;
 class URL;
 
 #if ENABLE(WEB_SOCKETS)
@@ -82,7 +81,7 @@
     void didFinishLoading(unsigned long identifier, DocumentLoader&, double finishTime);
     void didFailLoading(unsigned long identifier, DocumentLoader&, const ResourceError&);
     void didLoadResourceFromMemoryCache(DocumentLoader&, CachedResource&);
-    void didFinishXHRLoading(ThreadableLoaderClient*, unsigned long identifier, const String& decodedText);
+    void didFinishXHRLoading(unsigned long identifier, const String& decodedText);
     void didReceiveXHRResponse(unsigned long identifier);
     void willLoadXHRSynchronously();
     void didLoadXHRSynchronously();

Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (209168 => 209169)


--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp	2016-12-01 02:42:28 UTC (rev 209168)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp	2016-12-01 03:16:13 UTC (rev 209169)
@@ -983,7 +983,7 @@
     std::optional<String> decodedText;
     if (!m_binaryResponseBuilder)
         decodedText = m_responseBuilder.toStringPreserveCapacity();
-    InspectorInstrumentation::didFinishXHRLoading(scriptExecutionContext(), this, identifier, decodedText, m_url, m_lastSendURL, m_lastSendLineNumber, m_lastSendColumnNumber);
+    InspectorInstrumentation::didFinishXHRLoading(scriptExecutionContext(), identifier, decodedText, m_url, m_lastSendURL, m_lastSendLineNumber, m_lastSendColumnNumber);
 
     bool hadLoader = m_loader;
     m_loader = nullptr;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to