Title: [137198] trunk
- Revision
- 137198
- Author
- zandober...@gmail.com
- Date
- 2012-12-10 13:07:16 -0800 (Mon, 10 Dec 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137197 => 137198)
--- trunk/Source/WebCore/ChangeLog 2012-12-10 20:21:49 UTC (rev 137197)
+++ trunk/Source/WebCore/ChangeLog 2012-12-10 21:07:16 UTC (rev 137198)
@@ -1,3 +1,19 @@
+2012-12-10 Zan Dobersek <zandober...@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 <g...@gnome.org>
Unreviewed distcheck fix.
Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (137197 => 137198)
--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2012-12-10 20:21:49 UTC (rev 137197)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2012-12-10 21:07:16 UTC (rev 137198)
@@ -85,14 +85,9 @@
void ResourceRequest::updateFromSoupMessage(SoupMessage* soupMessage)
{
- bool shouldPortBeResetToZero = m_url.hasPort() && !m_url.port();
- m_url = soupURIToKURL(soup_message_get_uri(soupMessage));
+ if (soupMessage->status_code == SOUP_STATUS_CANCELLED)
+ setURL(KURL());
- // SoupURI cannot differeniate between an explicitly specified port 0 and
- // no port specified.
- if (shouldPortBeResetToZero)
- m_url.setPort(0);
-
m_httpMethod = String::fromUTF8(soupMessage->method);
m_httpHeaderFields.clear();
Modified: trunk/Tools/ChangeLog (137197 => 137198)
--- trunk/Tools/ChangeLog 2012-12-10 20:21:49 UTC (rev 137197)
+++ trunk/Tools/ChangeLog 2012-12-10 21:07:16 UTC (rev 137198)
@@ -1,3 +1,16 @@
+2012-12-10 Zan Dobersek <zandober...@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 <joc...@chromium.org>
[chromium] Move the test implementation of WebKit::WebPlugin to the TestRunner library
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (137197 => 137198)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-12-10 20:21:49 UTC (rev 137197)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-12-10 21:07:16 UTC (rev 137198)
@@ -1259,11 +1259,9 @@
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;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
