Changeset 57449 in webkit

Timestamp:

Apr 11, 2010 8:37:27 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-11 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

[Qt] Add setWillSendRequestReturnsNull and setWillSendRequestClearHeader

Unskip:

http/tests/security/no-referrer.html
fast/loader/onload-willSendRequest-null-for-frame.html
fast/loader/onload-willSendRequest-null-for-script.html

​https://bugs.webkit.org/show_bug.cgi?id=37410

• platform/qt/Skipped:

2010-04-11 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

[Qt] Add setWillSendRequestReturnsNull and setWillSendRequestClearHeader

​https://bugs.webkit.org/show_bug.cgi?id=37410

• WebCoreSupport/FrameLoaderClientQt.cpp: (qt_set_will_send_request_returns_null): (qt_set_will_send_request_clear_headers): (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):

2010-04-11 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

[Qt] Add setWillSendRequestReturnsNull and setWillSendRequestClearHeader

​https://bugs.webkit.org/show_bug.cgi?id=37410

• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::reset): (LayoutTestController::setWillSendRequestReturnsNull): (LayoutTestController::setWillSendRequestClearHeader):
• DumpRenderTree/qt/LayoutTestControllerQt.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp (modified) (4 diffs)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (3 diffs)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-11  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add setWillSendRequestReturnsNull and setWillSendRequestClearHeader
+
+        Unskip:
+          http/tests/security/no-referrer.html
+          fast/loader/onload-willSendRequest-null-for-frame.html
+          fast/loader/onload-willSendRequest-null-for-script.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=37410
+
+        * platform/qt/Skipped:
+
 2010-04-10  Adam Barth  <abarth@webkit.org>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -302 +302 @@
 http/tests/misc/redirect-to-external-url.html
 http/tests/security/feed-urls-from-remote.html
-
-# Missing layoutTestController.setWillSendRequestClearHeader()
-http/tests/security/no-referrer.html
-
-# Missing layoutTestController.setWillSendRequestReturnsNull()
-fast/loader/onload-willSendRequest-null-for-frame.html
-fast/loader/onload-willSendRequest-null-for-script.html
 
 # Missing layoutTestController.evaluateScriptInIsolatedWorld()

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-04-11  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add setWillSendRequestReturnsNull and setWillSendRequestClearHeader
+
+        https://bugs.webkit.org/show_bug.cgi?id=37410
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (qt_set_will_send_request_returns_null):
+        (qt_set_will_send_request_clear_headers):
+        (WebCore::FrameLoaderClientQt::dispatchWillSendRequest):
+
 2010-04-10  Robert Hogan  <robert@webkit.org>
 

trunk/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

@@ -76 +76 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
+#include <QStringList>
 #include "qwebhistory_p.h"
 
@@ -81 +82 @@
 static bool dumpResourceLoadCallbacks = false;
 static bool sendRequestReturnsNullOnRedirect = false;
+static bool sendRequestReturnsNull = false;
+static QStringList sendRequestClearHeaders;
 
 static QMap<unsigned long, QString> dumpAssignedUrls;
@@ -97 +100 @@
 {
     sendRequestReturnsNullOnRedirect = b;
+}
+
+void QWEBKIT_EXPORT qt_set_will_send_request_returns_null(bool b)
+{
+    sendRequestReturnsNull = b;
+}
+
+void QWEBKIT_EXPORT qt_set_will_send_request_clear_headers(const QStringList& headers)
+{
+    sendRequestClearHeaders = headers;
 }
 
@@ -855 +868 @@
                (redirectResponse.isNull()) ? "(null)" : qPrintable(drtDescriptionSuitableForTestResult(redirectResponse)));
 
+    if (sendRequestReturnsNull)
+        newRequest.setURL(QUrl());
+
     if (sendRequestReturnsNullOnRedirect && !redirectResponse.isNull()) {
         printf("Returning null for this redirect\n");
         newRequest.setURL(QUrl());
     }
+
+    for (int i = 0; i < sendRequestClearHeaders.size(); ++i)
+          newRequest.setHTTPHeaderField(sendRequestClearHeaders.at(i).toLocal8Bit().constData(), QString());
 
     // seems like the Mac code doesn't do anything here by default neither

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-11  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add setWillSendRequestReturnsNull and setWillSendRequestClearHeader
+
+        https://bugs.webkit.org/show_bug.cgi?id=37410
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::reset):
+        (LayoutTestController::setWillSendRequestReturnsNull):
+        (LayoutTestController::setWillSendRequestClearHeader):
+        * DumpRenderTree/qt/LayoutTestControllerQt.h:
+
 2010-04-11  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -42 +42 @@
 extern void qt_dump_resource_load_callbacks(bool b);
 extern void qt_set_will_send_request_returns_null_on_redirect(bool b);
+extern void qt_set_will_send_request_returns_null(bool b);
+extern void qt_set_will_send_request_clear_headers(const QStringList& headers);
+
 extern void qt_dump_notification(bool b);
 
@@ -74 +77 @@
     qt_dump_resource_load_callbacks(false);
     qt_set_will_send_request_returns_null_on_redirect(false);
+    qt_set_will_send_request_returns_null(false);
+    qt_set_will_send_request_clear_headers(QStringList());
     emit hidePage();
 }
@@ -228 +233 @@
 {
     qt_set_will_send_request_returns_null_on_redirect(enabled);
+}
+
+void LayoutTestController::setWillSendRequestReturnsNull(bool enabled)
+{
+    qt_set_will_send_request_returns_null(enabled);
+}
+
+void LayoutTestController::setWillSendRequestClearHeader(const QStringList& headers)
+{
+    qt_set_will_send_request_clear_headers(headers);
 }
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.h

@@ -104 +104 @@
     void dumpResourceLoadCallbacks();
     void setWillSendRequestReturnsNullOnRedirect(bool enabled);
+    void setWillSendRequestReturnsNull(bool enabled);
+    void setWillSendRequestClearHeader(const QStringList& headers);
     void queueBackNavigation(int howFarBackward);
     void queueForwardNavigation(int howFarForward);