Title: [137947] trunk
- Revision
- 137947
- Author
- [email protected]
- Date
- 2012-12-17 14:36:16 -0800 (Mon, 17 Dec 2012)
Log Message
Unreviewed, rolling out r137198.
http://trac.webkit.org/changeset/137198
https://bugs.webkit.org/show_bug.cgi?id=105212
This patch is causing API behavior compatibility problems
(Requested by zdobersek on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-12-17
Source/WebCore:
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateFromSoupMessage):
Tools:
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(willSendRequestCallback):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137946 => 137947)
--- trunk/Source/WebCore/ChangeLog 2012-12-17 22:24:03 UTC (rev 137946)
+++ trunk/Source/WebCore/ChangeLog 2012-12-17 22:36:16 UTC (rev 137947)
@@ -1,3 +1,15 @@
+2012-12-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r137198.
+ http://trac.webkit.org/changeset/137198
+ https://bugs.webkit.org/show_bug.cgi?id=105212
+
+ This patch is causing API behavior compatibility problems
+ (Requested by zdobersek on #webkit).
+
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateFromSoupMessage):
+
2012-12-17 Dominic Mazzoni <[email protected]>
AX: textUnderElement should consider alt text, but skip links and controls
Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (137946 => 137947)
--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2012-12-17 22:24:03 UTC (rev 137946)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2012-12-17 22:36:16 UTC (rev 137947)
@@ -85,9 +85,14 @@
void ResourceRequest::updateFromSoupMessage(SoupMessage* soupMessage)
{
- if (soupMessage->status_code == SOUP_STATUS_CANCELLED)
- setURL(KURL());
+ 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);
+
m_httpMethod = String::fromUTF8(soupMessage->method);
m_httpHeaderFields.clear();
Modified: trunk/Tools/ChangeLog (137946 => 137947)
--- trunk/Tools/ChangeLog 2012-12-17 22:24:03 UTC (rev 137946)
+++ trunk/Tools/ChangeLog 2012-12-17 22:36:16 UTC (rev 137947)
@@ -1,3 +1,15 @@
+2012-12-17 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r137198.
+ http://trac.webkit.org/changeset/137198
+ https://bugs.webkit.org/show_bug.cgi?id=105212
+
+ This patch is causing API behavior compatibility problems
+ (Requested by zdobersek on #webkit).
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (willSendRequestCallback):
+
2012-12-17 Elliott Sprehn <[email protected]>
Unreviewed. Adding myself to committers list.
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (137946 => 137947)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-12-17 22:24:03 UTC (rev 137946)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-12-17 22:36:16 UTC (rev 137947)
@@ -1263,9 +1263,11 @@
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.
- soup_message_set_status(webkit_network_request_get_message(request), SOUP_STATUS_CANCELLED);
+ webkit_network_request_set_uri(request, "about:blank");
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
