Diff
Modified: trunk/LayoutTests/ChangeLog (129486 => 129487)
--- trunk/LayoutTests/ChangeLog 2012-09-25 11:06:08 UTC (rev 129486)
+++ trunk/LayoutTests/ChangeLog 2012-09-25 11:23:54 UTC (rev 129487)
@@ -1,5 +1,18 @@
2012-09-25 Christophe Dumez <[email protected]>
+ [WK2][WKTR] TestRunner needs support for setWillSendRequestReturnsNullOnRedirect
+ https://bugs.webkit.org/show_bug.cgi?id=97542
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Unskip http/tests/misc/will-send-request-returns-null-on-redirect.html
+ for WebKit2 now that WebKitTestRunner supports
+ setWillSendRequestReturnsNullOnRedirect.
+
+ * platform/wk2/Skipped:
+
+2012-09-25 Christophe Dumez <[email protected]>
+
[WK2] Remove passing tests from Skipped list
https://bugs.webkit.org/show_bug.cgi?id=97546
Modified: trunk/LayoutTests/platform/wk2/Skipped (129486 => 129487)
--- trunk/LayoutTests/platform/wk2/Skipped 2012-09-25 11:06:08 UTC (rev 129486)
+++ trunk/LayoutTests/platform/wk2/Skipped 2012-09-25 11:23:54 UTC (rev 129487)
@@ -577,9 +577,6 @@
# WebKitTestRunner needs layoutTestController.shouldPaintBrockenImage
fast/images/support-broken-image-delegate.html
-# WebKitTestRunner needs layoutTestController.setWillSendRequestReturnNullOnRedirect
-http/tests/misc/will-send-request-returns-null-on-redirect.html
-
# WebKitTestrunner needs layoutTestController.dumpSourceAsWebArchive
webarchive/doctype.html
webarchive/archive-empty-frame-source.html
Modified: trunk/Tools/ChangeLog (129486 => 129487)
--- trunk/Tools/ChangeLog 2012-09-25 11:06:08 UTC (rev 129486)
+++ trunk/Tools/ChangeLog 2012-09-25 11:23:54 UTC (rev 129487)
@@ -1,3 +1,23 @@
+2012-09-25 Christophe Dumez <[email protected]>
+
+ [WK2][WKTR] TestRunner needs support for setWillSendRequestReturnsNullOnRedirect
+ https://bugs.webkit.org/show_bug.cgi?id=97542
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Implement support for setWillSendRequestReturnsNullOnRedirect
+ in WebKitTestRunner.
+
+ * WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl:
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::willSendRequestForFrame):
+ * WebKitTestRunner/InjectedBundle/TestRunner.cpp:
+ (WTR::TestRunner::TestRunner):
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ (WTR::TestRunner::willSendRequestReturnsNullOnRedirect):
+ (WTR::TestRunner::setWillSendRequestReturnsNullOnRedirect):
+ (TestRunner):
+
2012-09-25 Xiaobo Wang <[email protected]>
[BlackBerry] [DRT] fast/forms/textarea-live-pseudo-selectors.html failed
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl (129486 => 129487)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-09-25 11:06:08 UTC (rev 129486)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/TestRunner.idl 2012-09-25 11:23:54 UTC (rev 129487)
@@ -138,6 +138,7 @@
void setTextDirection(in DOMString direction);
void setWillSendRequestReturnsNull(in boolean flag);
+ void setWillSendRequestReturnsNullOnRedirect(in boolean flag);
void setShouldStayOnPageAfterHandlingBeforeUnload(in boolean flag);
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (129486 => 129487)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-09-25 11:06:08 UTC (rev 129486)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2012-09-25 11:23:54 UTC (rev 129487)
@@ -1147,9 +1147,6 @@
WKURLRequestRef InjectedBundlePage::willSendRequestForFrame(WKBundlePageRef, WKBundleFrameRef frame, uint64_t identifier, WKURLRequestRef request, WKURLResponseRef response)
{
- if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().testRunner()->willSendRequestReturnsNull())
- return 0;
-
if (InjectedBundle::shared().isTestRunning()
&& InjectedBundle::shared().testRunner()->shouldDumpResourceLoadCallbacks()) {
dumpResourceURL(identifier);
@@ -1160,6 +1157,15 @@
InjectedBundle::shared().stringBuilder()->append('\n');
}
+ if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().testRunner()->willSendRequestReturnsNull())
+ return 0;
+
+ WKRetainPtr<WKURLRef> redirectURL = adoptWK(WKURLResponseCopyURL(response));
+ if (InjectedBundle::shared().isTestRunning() && InjectedBundle::shared().testRunner()->willSendRequestReturnsNullOnRedirect() && redirectURL) {
+ InjectedBundle::shared().stringBuilder()->appendLiteral("Returning null for this redirect\n");
+ return 0;
+ }
+
WKRetainPtr<WKURLRef> url = ""
WKRetainPtr<WKStringRef> host = adoptWK(WKURLCopyHostName(url.get()));
WKRetainPtr<WKStringRef> scheme = adoptWK(WKURLCopyScheme(url.get()));
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp (129486 => 129487)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-09-25 11:06:08 UTC (rev 129486)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.cpp 2012-09-25 11:23:54 UTC (rev 129487)
@@ -87,6 +87,7 @@
, m_testRepaint(false)
, m_testRepaintSweepHorizontally(false)
, m_willSendRequestReturnsNull(false)
+ , m_willSendRequestReturnsNullOnRedirect(false)
, m_shouldStopProvisionalFrameLoads(false)
, m_policyDelegateEnabled(false)
, m_policyDelegatePermissive(false)
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (129486 => 129487)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-09-25 11:06:08 UTC (rev 129486)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2012-09-25 11:23:54 UTC (rev 129487)
@@ -199,8 +199,10 @@
void setPOSIXLocale(JSStringRef);
- bool willSendRequestReturnsNull() { return m_willSendRequestReturnsNull; }
+ bool willSendRequestReturnsNull() const { return m_willSendRequestReturnsNull; }
void setWillSendRequestReturnsNull(bool f) { m_willSendRequestReturnsNull = f; }
+ bool willSendRequestReturnsNullOnRedirect() const { return m_willSendRequestReturnsNullOnRedirect; }
+ void setWillSendRequestReturnsNullOnRedirect(bool f) { m_willSendRequestReturnsNullOnRedirect = f; }
void setTextDirection(JSStringRef);
@@ -291,6 +293,7 @@
bool m_testRepaintSweepHorizontally;
bool m_willSendRequestReturnsNull;
+ bool m_willSendRequestReturnsNullOnRedirect;
bool m_shouldStopProvisionalFrameLoads;
bool m_policyDelegateEnabled;
