Changeset 85316 in webkit

Timestamp:

Apr 29, 2011 4:43:30 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Pavel Feldman.

Web Inspector: Hyperlink Auditing (ping) requests are not shown in network panel
​https://bugs.webkit.org/show_bug.cgi?id=58794

Added ping requests to network panel.

• http/tests/inspector/network/ping-expected.txt: Added.
• http/tests/inspector/network/ping.html: Added.

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

Reviewed by Pavel Feldman.

Web Inspector: Hyperlink Auditing (ping) requests are not shown in network panel
​https://bugs.webkit.org/show_bug.cgi?id=58794

Added ping requests to network panel.

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

• English.lproj/localizedStrings.js:
• inspector/InspectorInstrumentation.cpp: (WebCore::InspectorInstrumentation::continueAfterPingLoaderImpl):
• inspector/InspectorInstrumentation.h: (WebCore::InspectorInstrumentation::continueAfterPingLoader):
• inspector/front-end/NetworkPanel.js: (WebInspector.NetworkDataGridNode.prototype.refreshResource): (WebInspector.NetworkDataGridNode.prototype._refreshStatusCell): (WebInspector.NetworkDataGridNode.prototype._refreshTypeCell):
• inspector/front-end/Resource.js: (WebInspector.Resource.prototype.get formParameters): (WebInspector.Resource.prototype.requestContentType): (WebInspector.Resource.prototype.isPingRequest):
• loader/PingLoader.cpp: (WebCore::PingLoader::PingLoader):
• loader/PingLoader.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/inspector/network/ping-expected.txt (added)
• LayoutTests/http/tests/inspector/network/ping.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/English.lproj/localizedStrings.js (modified) (previous)
• Source/WebCore/inspector/InspectorInstrumentation.cpp (modified) (1 diff)
• Source/WebCore/inspector/InspectorInstrumentation.h (modified) (3 diffs)
• Source/WebCore/inspector/front-end/NetworkPanel.js (modified) (2 diffs)
• Source/WebCore/inspector/front-end/Resource.js (modified) (2 diffs)
• Source/WebCore/loader/PingLoader.cpp (modified) (3 diffs)
• Source/WebCore/loader/PingLoader.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-04-29  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Hyperlink Auditing (ping) requests are not shown in network panel
+        https://bugs.webkit.org/show_bug.cgi?id=58794
+
+        Added ping requests to network panel.
+
+        * http/tests/inspector/network/ping-expected.txt: Added.
+        * http/tests/inspector/network/ping.html: Added.
+
 2011-04-28  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-29  Vsevolod Vlasov  <vsevik@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Hyperlink Auditing (ping) requests are not shown in network panel
+        https://bugs.webkit.org/show_bug.cgi?id=58794
+
+        Added ping requests to network panel.
+
+        Test: http/tests/inspector/network/ping.html
+
+        * English.lproj/localizedStrings.js:
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::continueAfterPingLoaderImpl):
+        * inspector/InspectorInstrumentation.h:
+        (WebCore::InspectorInstrumentation::continueAfterPingLoader):
+        * inspector/front-end/NetworkPanel.js:
+        (WebInspector.NetworkDataGridNode.prototype.refreshResource):
+        (WebInspector.NetworkDataGridNode.prototype._refreshStatusCell):
+        (WebInspector.NetworkDataGridNode.prototype._refreshTypeCell):
+        * inspector/front-end/Resource.js:
+        (WebInspector.Resource.prototype.get formParameters):
+        (WebInspector.Resource.prototype.requestContentType):
+        (WebInspector.Resource.prototype.isPingRequest):
+        * loader/PingLoader.cpp:
+        (WebCore::PingLoader::PingLoader):
+        * loader/PingLoader.h:
+
 2011-04-28  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp

@@ -404 +404 @@
 }
 
+void InspectorInstrumentation::continueAfterPingLoaderImpl(InspectorAgent* inspectorAgent, unsigned long identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& response)
+{
+    willSendRequestImpl(inspectorAgent, identifier, loader, request, response);
+}
+
 void InspectorInstrumentation::markResourceAsCachedImpl(InspectorAgent* inspectorAgent, unsigned long identifier)
 {

trunk/Source/WebCore/inspector/InspectorInstrumentation.h

@@ -114 +114 @@
     static void applyUserAgentOverride(Frame*, String*);
     static void willSendRequest(Frame*, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
+    static void continueAfterPingLoader(Frame*, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse&);
     static void markResourceAsCached(Page*, unsigned long identifier);
     static void didLoadResourceFromMemoryCache(Page*, DocumentLoader*, const CachedResource*);
@@ -235 +236 @@
     static void applyUserAgentOverrideImpl(InspectorAgent*, String*);
     static void willSendRequestImpl(InspectorAgent*, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
+    static void continueAfterPingLoaderImpl(InspectorAgent*, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse&);
     static void markResourceAsCachedImpl(InspectorAgent*, unsigned long identifier);
     static void didLoadResourceFromMemoryCacheImpl(InspectorAgent*, DocumentLoader*, const CachedResource*);
@@ -629 +631 @@
 }
 
+inline void InspectorInstrumentation::continueAfterPingLoader(Frame* frame, unsigned long identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& response)
+{
+#if ENABLE(INSPECTOR)
+    if (InspectorAgent* ic = inspectorAgentForFrame(frame))
+        InspectorInstrumentation::continueAfterPingLoaderImpl(ic, identifier, loader, request, response);
+#endif
+}
+
 inline void InspectorInstrumentation::markResourceAsCached(Page* page, unsigned long identifier)
 {

trunk/Source/WebCore/inspector/front-end/NetworkPanel.js

@@ -1489 +1489 @@
 
         this._refreshStatusCell();
-
-        if (this._resource.mimeType) {
-            this._typeCell.removeStyleClass("network-dim-cell");
-            this._typeCell.setTextAndTitle(this._resource.mimeType);
-        } else {
-            this._typeCell.addStyleClass("network-dim-cell");
-            this._typeCell.setTextAndTitle(WebInspector.UIString("Pending"));
-        }
-
+        this._refreshTypeCell();
         this._refreshSizeCell();
         this._refreshTimeCell();
@@ -1580 +1572 @@
             if (this._resource.isDataURL() && this._resource.finished)
                 this._statusCell.setTextAndTitle(WebInspector.UIString("(data url)"));
+            else if (this._resource.isPingRequest())
+                this._statusCell.setTextAndTitle(WebInspector.UIString("(ping)"));
             else
                 this._statusCell.setTextAndTitle(WebInspector.UIString("(Pending)"));
             this._statusCell.addStyleClass("network-dim-cell");
+        }
+    },
+
+    _refreshTypeCell: function()
+    {
+        if (this._resource.mimeType) {
+            this._typeCell.removeStyleClass("network-dim-cell");
+            this._typeCell.setTextAndTitle(this._resource.mimeType);
+        } else if (this._resource.isPingRequest) {
+            this._typeCell.removeStyleClass("network-dim-cell");
+            this._typeCell.setTextAndTitle(this._resource.requestContentType());
+        } else {
+            this._typeCell.addStyleClass("network-dim-cell");
+            this._typeCell.setTextAndTitle(WebInspector.UIString("Pending"));
         }
     },

trunk/Source/WebCore/inspector/front-end/Resource.js

@@ -588 +588 @@
         if (!this.requestFormData)
             return;
-        var requestContentType = this.requestHeaderValue("Content-Type");
+        var requestContentType = this.requestContentType();
         if (!requestContentType || !requestContentType.match(/^application\/x-www-form-urlencoded\s*(;.*)?$/i))
             return;
@@ -848 +848 @@
     },
     
+    requestContentType: function()
+    {
+        return this.requestHeaderValue("Content-Type");
+    },
+
+    isPingRequest: function()
+    {
+        return "text/ping" === this.requestContentType();
+    },
+    
     _contentURL: function()
     {

trunk/Source/WebCore/loader/PingLoader.cpp

@@ -37 +37 @@
 #include "Frame.h"
 #include "FrameLoaderClient.h"
+#include "InspectorInstrumentation.h"
 #include "Page.h"
 #include "ProgressTracker.h"
@@ -111 +112 @@
 }
 
-PingLoader::PingLoader(Frame* frame, const ResourceRequest& request)
+PingLoader::PingLoader(Frame* frame, ResourceRequest& request)
     : m_timeout(this, &PingLoader::timeout)
 {
@@ -117 +118 @@
     m_shouldUseCredentialStorage = frame->loader()->client()->shouldUseCredentialStorage(frame->loader()->activeDocumentLoader(), identifier);
     m_handle = ResourceHandle::create(frame->loader()->networkingContext(), request, this, false, false);
+
+    InspectorInstrumentation::continueAfterPingLoader(frame, identifier, frame->loader()->activeDocumentLoader(), request, ResourceResponse());
 
     // If the server never responds, FrameLoader won't be able to cancel this load and

trunk/Source/WebCore/loader/PingLoader.h

@@ -62 +62 @@
 
 private:
-    PingLoader(Frame*, const ResourceRequest&);
+    PingLoader(Frame*, ResourceRequest&);
 
     void didReceiveResponse(ResourceHandle*, const ResourceResponse&) { delete this; }