Changeset 116071 in webkit

Timestamp:

May 3, 2012 11:24:45 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] DRT should support LayoutTestController's willSendRequestReturnsNullOnRedirect()
​https://bugs.webkit.org/show_bug.cgi?id=82704

Patch by Christophe Dumez <Christophe Dumez> on 2012-05-03
Reviewed by Antonio Gomes.

Tools:

EFL's DRT needs to obey LayoutTestController's
willSendRequestReturnsNullOnRedirect().

• DumpRenderTree/efl/DumpRenderTreeChrome.cpp:

(DumpRenderTreeChrome::onWillSendRequest):

LayoutTests:

Update test_expectations.txt now that EFL's DumpRenderTree supports
LayoutTestController's willSendRequestReturnsNullOnRedirect().

• platform/efl/Skipped:
• platform/efl/test_expectations.txt:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl/Skipped (modified) (1 diff)
• LayoutTests/platform/efl/test_expectations.txt (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-03  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] DRT should support LayoutTestController's willSendRequestReturnsNullOnRedirect()
+        https://bugs.webkit.org/show_bug.cgi?id=82704
+
+        Reviewed by Antonio Gomes.
+
+        Update test_expectations.txt now that EFL's DumpRenderTree supports
+        LayoutTestController's willSendRequestReturnsNullOnRedirect().
+
+        * platform/efl/Skipped:
+        * platform/efl/test_expectations.txt:
+
 2012-05-03  Zan Dobersek  <zandobersek@gmail.com>
 

trunk/LayoutTests/platform/efl/Skipped

@@ -587 +587 @@
 # BUG: Missing resource load callback ability in DRT
 http/tests/loading/redirect-methods.html
-
-# Requires willSendRequestReturnsNullOnRedirect + willSendRequest + didFinishLoading
-http/tests/misc/will-send-request-returns-null-on-redirect.html
-http/tests/misc/favicon-loads-with-icon-loading-override.html
 
 # BUG: No authentication challenge handling

trunk/LayoutTests/platform/efl/test_expectations.txt

@@ -263 +263 @@
 BUGWK85492 : css3/zoom-coords.xhtml = TEXT
 
+// Redirect response URL is not the one expected
+BUGWK85072 : http/tests/misc/will-send-request-returns-null-on-redirect.html = TEXT
+
+// No support for overriding WebKitLoadSiteIconsKey
+BUGWK85171 : http/tests/misc/favicon-loads-with-icon-loading-override.html = TEXT
+
 // IETC flexbox failures
 BUGWK85211 : ietestcenter/css3/flexbox/flexbox-align-stretch-001.htm = IMAGE

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-03  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL] DRT should support LayoutTestController's willSendRequestReturnsNullOnRedirect()
+        https://bugs.webkit.org/show_bug.cgi?id=82704
+
+        Reviewed by Antonio Gomes.
+
+        EFL's DRT needs to obey LayoutTestController's
+        willSendRequestReturnsNullOnRedirect().
+
+        * DumpRenderTree/efl/DumpRenderTreeChrome.cpp:
+        (DumpRenderTreeChrome::onWillSendRequest):
+
 2012-05-03  Raphael Kubo da Costa  <rakuco@webkit.org>
 

trunk/Tools/DumpRenderTree/efl/DumpRenderTreeChrome.cpp

@@ -433 +433 @@
     if (!done && gLayoutTestController->dumpResourceLoadCallbacks())
         printf("%s - willSendRequest %s redirectResponse %s\n",
-               pathSuitableForTestResult(messages->request->url).data(),
+               m_dumpAssignedUrls.contains(messages->request->identifier) ? m_dumpAssignedUrls.get(messages->request->identifier).data() : "<unknown>",
                descriptionSuitableForTestResult(messages->request).data(),
                descriptionSuitableForTestResult(messages->redirect_response).data());
@@ -439 +439 @@
     if (!done && gLayoutTestController->willSendRequestReturnsNull()) {
         // As requested by the LayoutTestController, don't perform the request.
+        messages->request->url = 0;
+        return;
+    }
+
+    if (!done && gLayoutTestController->willSendRequestReturnsNullOnRedirect() && messages->redirect_response) {
+        printf("Returning null for this redirect\n");
         messages->request->url = 0;
         return;