Changeset 83933 in webkit

Timestamp:

Apr 14, 2011 7:40:13 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-14 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: No headers information in network panel for downloads.
​https://bugs.webkit.org/show_bug.cgi?id=58139

Passed resource response to inspector for PolicyDownload and PolicyIgnore requests.

• http/tests/inspector/network/download-expected.txt: Added.
• http/tests/inspector/network/download.html: Added.
• http/tests/inspector/network/resources/download.zzz: Added.

2011-04-14 Vsevolod Vlasov <​vsevik@chromium.org>

Reviewed by Pavel Feldman.

Web Inspector: No headers information in network panel for downloads.
​https://bugs.webkit.org/show_bug.cgi?id=58139

Passed resource response to inspector for PolicyDownload and PolicyIgnore requests.

Test: http/tests/inspector/network/download.html

• inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::didReceiveResourceResponseButCanceledImpl): (WebCore::InspectorInstrumentation::continueWithPolicyDownloadImpl): (WebCore::InspectorInstrumentation::continueWithPolicyIgnoreImpl):
• inspector/InspectorInstrumentation.h: (WebCore::InspectorInstrumentation::continueWithPolicyDownload): (WebCore::InspectorInstrumentation::continueWithPolicyIgnore):
• loader/MainResourceLoader.cpp: (WebCore::MainResourceLoader::continueAfterContentPolicy):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/network/download-expected.txt (added)
• LayoutTests/http/tests/inspector/network/download.html (added)
• LayoutTests/http/tests/inspector/network/resources/download.zzz (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.h (modified) (3 diffs)
• Source/WebCore/loader/MainResourceLoader.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-14  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: No headers information in network panel for downloads.
+        https://bugs.webkit.org/show_bug.cgi?id=58139
+
+        Passed resource response to inspector for PolicyDownload and PolicyIgnore requests.
+
+        * http/tests/inspector/network/download-expected.txt: Added.
+        * http/tests/inspector/network/download.html: Added.
+        * http/tests/inspector/network/resources/download.zzz: Added.
+
 2011-04-14  Naoki Takano  <takano.naoki@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: No headers information in network panel for downloads.
+        https://bugs.webkit.org/show_bug.cgi?id=58139
+
+        Passed resource response to inspector for PolicyDownload and PolicyIgnore requests.
+
+        Test: http/tests/inspector/network/download.html
+
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::didReceiveResourceResponseButCanceledImpl):
+        (WebCore::InspectorInstrumentation::continueWithPolicyDownloadImpl):
+        (WebCore::InspectorInstrumentation::continueWithPolicyIgnoreImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::continueWithPolicyDownload):
+        (WebCore::InspectorInstrumentation::continueWithPolicyIgnore):
+        * loader/MainResourceLoader.cpp:
+        (WebCore::MainResourceLoader::continueAfterContentPolicy):
+
 2011-04-14  Joone Hur  <joone.hur@collabora.co.uk>
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -458 +458 @@
 }
 
+void InspectorInstrumentation::didReceiveResourceResponseButCanceledImpl(Frame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)
+{
+    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(frame, identifier, r);
+    InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, loader, r);
+}
+
+void InspectorInstrumentation::continueWithPolicyDownloadImpl(Frame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)
+{
+    didReceiveResourceResponseButCanceledImpl(frame, loader, identifier, r);
+}
+
+void InspectorInstrumentation::continueWithPolicyIgnoreImpl(Frame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)
+{
+    didReceiveResourceResponseButCanceledImpl(frame, loader, identifier, r);
+}
+
 void InspectorInstrumentation::didReceiveContentLengthImpl(InspectorAgent* inspectorAgent, unsigned long identifier, int dataLength, int lengthReceived)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -119 +119 @@
     static InspectorInstrumentationCookie willReceiveResourceResponse(Frame*, unsigned long identifier, const ResourceResponse&);
     static void didReceiveResourceResponse(const InspectorInstrumentationCookie&, unsigned long identifier, DocumentLoader*, const ResourceResponse&);
+    static void continueWithPolicyDownload(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
+    static void continueWithPolicyIgnore(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
     static void didReceiveContentLength(Frame*, unsigned long identifier, int dataLength, int lengthReceived);
     static void didFinishLoading(Frame*, unsigned long identifier, double finishTime);
@@ -235 +237 @@
     static InspectorInstrumentationCookie willReceiveResourceResponseImpl(InspectorAgent*, unsigned long identifier, const ResourceResponse&);
     static void didReceiveResourceResponseImpl(const InspectorInstrumentationCookie&, unsigned long identifier, DocumentLoader*, const ResourceResponse&);
+    static void didReceiveResourceResponseButCanceledImpl(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
+    static void continueWithPolicyDownloadImpl(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
+    static void continueWithPolicyIgnoreImpl(Frame*, DocumentLoader*, unsigned long identifier, const ResourceResponse&);
     static void didReceiveContentLengthImpl(InspectorAgent*, unsigned long identifier, int dataLength, int lengthReceived);
     static void didFinishLoadingImpl(InspectorAgent*, unsigned long identifier, double finishTime);
@@ -666 +671 @@
 }
 
+inline void InspectorInstrumentation::continueWithPolicyDownload(Frame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)
+{
+#if ENABLE(INSPECTOR)
+    if (inspectorAgentWithFrontendForFrame(frame))
+        InspectorInstrumentation::continueWithPolicyDownloadImpl(frame, loader, identifier, r);
+#endif
+}
+
+inline void InspectorInstrumentation::continueWithPolicyIgnore(Frame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)
+{
+#if ENABLE(INSPECTOR)
+    if (inspectorAgentWithFrontendForFrame(frame))
+        InspectorInstrumentation::continueWithPolicyIgnoreImpl(frame, loader, identifier, r);
+#endif
+}
+
 inline void InspectorInstrumentation::didReceiveContentLength(Frame* frame, unsigned long identifier, int dataLength, int lengthReceived)
 {

trunk/Source/WebCore/loader/MainResourceLoader.cpp

@@ -40 +40 @@
 #include "FrameLoaderClient.h"
 #include "HTMLFormElement.h"
+#include "InspectorInstrumentation.h"
 #include "Page.h"
 #if PLATFORM(QT)
@@ -263 +264 @@
             return;
         }
+        InspectorInstrumentation::continueWithPolicyDownload(m_frame.get(), documentLoader(), identifier(), r);
         frameLoader()->client()->download(m_handle.get(), request(), m_handle.get()->firstRequest(), r);
         // It might have gone missing
@@ -270 +272 @@
 
     case PolicyIgnore:
+        InspectorInstrumentation::continueWithPolicyIgnore(m_frame.get(), documentLoader(), identifier(), r);
         stopLoadingForPolicyChange();
         return;