Changeset 137198 in webkit

Timestamp:

Dec 10, 2012 1:07:16 PM (11 years ago)

Author:

zandobersek@gmail.com

Message:

REGRESSION (r118735): svg/dom/complex-svgView-specification.html, svg/dom/SVGViewSpec.html, svg/dom/viewspec-parser.html failing on GTK Linux 64-bit Release
​https://bugs.webkit.org/show_bug.cgi?id=87734

Reviewed by Martin Robinson.

Source/WebCore:

Don't modify ResourceRequest's URL to have the value of the (encoded)
URI of the SoupMessage. The only exception is in the case of cancelled
SoupMessage - the URL of the ResourceRequest should then be null.

No new tests - existing tests should show no regressions.

• platform/network/soup/ResourceRequestSoup.cpp:

(WebCore::ResourceRequest::updateFromSoupMessage):

Tools:

When willSendRequest should return null in testing, cancel the SoupMessage
instead of setting the request's URI to about:blank.

• DumpRenderTree/gtk/DumpRenderTree.cpp:

(willSendRequestCallback):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-10  Zan Dobersek  <zandobersek@gmail.com>
+
+        REGRESSION (r118735): svg/dom/complex-svgView-specification.html, svg/dom/SVGViewSpec.html, svg/dom/viewspec-parser.html failing on GTK Linux 64-bit Release
+        https://bugs.webkit.org/show_bug.cgi?id=87734
+
+        Reviewed by Martin Robinson.
+
+        Don't modify ResourceRequest's URL to have the value of the (encoded)
+        URI of the SoupMessage. The only exception is in the case of cancelled
+        SoupMessage - the URL of the ResourceRequest should then be null.
+
+        No new tests - existing tests should show no regressions.
+
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::updateFromSoupMessage):
+
 2012-12-10  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp

@@ -86 +86 @@
 void ResourceRequest::updateFromSoupMessage(SoupMessage* soupMessage)
 {
-    bool shouldPortBeResetToZero = m_url.hasPort() && !m_url.port();
-    m_url = soupURIToKURL(soup_message_get_uri(soupMessage));
-
-    // SoupURI cannot differeniate between an explicitly specified port 0 and
-    // no port specified.
-    if (shouldPortBeResetToZero)
-        m_url.setPort(0);
+    if (soupMessage->status_code == SOUP_STATUS_CANCELLED)
+        setURL(KURL());
 
     m_httpMethod = String::fromUTF8(soupMessage->method);

trunk/Tools/ChangeLog

@@ +1 @@
+2012-12-10  Zan Dobersek  <zandobersek@gmail.com>
+
+        REGRESSION (r118735): svg/dom/complex-svgView-specification.html, svg/dom/SVGViewSpec.html, svg/dom/viewspec-parser.html failing on GTK Linux 64-bit Release
+        https://bugs.webkit.org/show_bug.cgi?id=87734
+
+        Reviewed by Martin Robinson.
+
+        When willSendRequest should return null in testing, cancel the SoupMessage
+        instead of setting the request's URI to about:blank.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (willSendRequestCallback):
+
 2012-12-10  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -1260 +1260 @@
 static void willSendRequestCallback(WebKitWebView* webView, WebKitWebFrame* webFrame, WebKitWebResource* resource, WebKitNetworkRequest* request, WebKitNetworkResponse* response)
 {
-
-
     if (!done && gTestRunner->willSendRequestReturnsNull()) {
         // As requested by the TestRunner, don't perform the request.
-        webkit_network_request_set_uri(request, "about:blank");
+        soup_message_set_status(webkit_network_request_get_message(request), SOUP_STATUS_CANCELLED);
         return;
     }