REGRESSION (r129478-r129480): http/tests/loading/text-content-type-with-binary-extens...

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

Patch by Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com> on 2012-10-11
Reviewed by Kenneth Rohde Christiansen.

Tools:

Added decidePolicyForResponse callback for WTR PagePolicyClient.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
(WTR::TestController::decidePolicyForResponse):
(WTR):
* WebKitTestRunner/TestController.h:
(TestController):

LayoutTests:

Rebased http/tests/loading/text-content-type-with-binary-extension.html for WK2 EFL, as dumping order is affected.
Other WK2 ports will have to do the same.

* platform/efl-wk2/http/tests/loading/text-content-type-with-binary-extension-expected.txt: Added.
* platform/gtk-wk2/TestExpectations:
* platform/mac-wk2/TestExpectations:
* platform/qt-5.0-wk2/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@131057 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6f8488ee27d61feee18f08f3d3d270655c2a0ed5..c9bf3b843a399d174fd0de34ecf2259ba9d17fd5 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2012-10-11  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        REGRESSION (r129478-r129480): http/tests/loading/text-content-type-with-binary-extension.html failing on Apple MountainLion Debug WK2 (Tests)
+        https://bugs.webkit.org/show_bug.cgi?id=98527
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Rebased http/tests/loading/text-content-type-with-binary-extension.html for WK2 EFL, as dumping order is affected.
+        Other WK2 ports will have to do the same.
+
+        * platform/efl-wk2/http/tests/loading/text-content-type-with-binary-extension-expected.txt: Added.
+        * platform/gtk-wk2/TestExpectations:
+        * platform/mac-wk2/TestExpectations:
+        * platform/qt-5.0-wk2/TestExpectations:
+
 2012-10-11  Zan Dobersek  <zandobersek@gmail.com>
 
         Unreviewed GTK gardening.

diff --git a/LayoutTests/platform/efl-wk2/http/tests/loading/text-content-type-with-binary-extension-expected.txt b/LayoutTests/platform/efl-wk2/http/tests/loading/text-content-type-with-binary-extension-expected.txt
new file mode 100644 (file)
index 0000000..9332307
--- /dev/null
+++ b/LayoutTests/platform/efl-wk2/http/tests/loading/text-content-type-with-binary-extension-expected.txt
@@ -0,0 +1,12 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+frame "iframe" - didStartProvisionalLoadForFrame
+frame "iframe" - didFailProvisionalLoadWithError
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+Test for https://bugs.webkit.org/show_bug.cgi?id=17360 REGRESSION: mp4 file downloaded from server is downloaded as html.
+
+Binary data not loaded as text. Maybe PASS.
+
+

diff --git a/LayoutTests/platform/gtk-wk2/TestExpectations b/LayoutTests/platform/gtk-wk2/TestExpectations
index 889f6490d7947ba664621311580514cd189bdc67..fdc695112945d0a9dc2e9c8f024a7fb49bab62c9 100644 (file)
--- a/LayoutTests/platform/gtk-wk2/TestExpectations
+++ b/LayoutTests/platform/gtk-wk2/TestExpectations
@@ -613,6 +613,9 @@ Bug(GTK) svg/dom/viewspec-parser-3.html [ Pass ]
 Bug(GTK) svg/dom/viewspec-parser-4.html [ Pass ]
 Bug(GTK) svg/dom/viewspec-parser-5.html [ Pass ]
 
+# Will need rebaselining after bug 98527 fixed
+webkit.org/b/98527 http/tests/loading/text-content-type-with-binary-extension.html [ Failure ]
+
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Tests working in WK2 and failing in WK1
 #////////////////////////////////////////////////////////////////////////////////////////

diff --git a/LayoutTests/platform/mac-wk2/TestExpectations b/LayoutTests/platform/mac-wk2/TestExpectations
index 9bc0bf8b29bce1db729b44f47049b4bc86d100ae..8edda3c53188fb01a4595d7dd29880ea3bc07484 100644 (file)
--- a/LayoutTests/platform/mac-wk2/TestExpectations
+++ b/LayoutTests/platform/mac-wk2/TestExpectations
@@ -280,8 +280,7 @@ webkit.org/b/96580 css3/filters/custom/filter-fallback-to-software.html [ ImageO
 webkit.org/b/96832 fast/loader/images-enabled-unset-can-block-image-and-can-reload-in-place.html [ Failure ]
 webkit.org/b/96832 fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html [ Failure ]
 
-# http/tests/loading/text-content-type-with-binary-extension.html fails on Mac WK2 bots
-# https://bugs.webkit.org/show_bug.cgi?id=98527
+# Will need rebaselining after bug 98527 fixed
 webkit.org/b/98527 http/tests/loading/text-content-type-with-binary-extension.html [ Failure ]
 
 # Causes next test to crash

diff --git a/LayoutTests/platform/qt-5.0-wk2/TestExpectations b/LayoutTests/platform/qt-5.0-wk2/TestExpectations
index 52daca38ffb71f416749c4cda2177e9c66d421a7..7ff5bfa025491f1a3dd712cd46370568e2c97040 100644 (file)
--- a/LayoutTests/platform/qt-5.0-wk2/TestExpectations
+++ b/LayoutTests/platform/qt-5.0-wk2/TestExpectations
@@ -602,8 +602,8 @@ webkit.org/b/98897 fast/frames/inline-object-inside-frameset.html [ ImageOnlyFai
 webkit.org/b/98897 fast/repaint/overflow-flipped-writing-mode-block-in-regions.html [ ImageOnlyFailure ]
 webkit.org/b/98897 fast/repaint/textarea-set-disabled.html [ ImageOnlyFailure ]
 
-# [Qt][WK2] REGRESSION(r130967): It made http/tests/loading/text-content-type-with-binary-extension.html fail
-webkit.org/b/98994 http/tests/loading/text-content-type-with-binary-extension.html
+# Will need rebaselining after bug 98527 fixed
+webkit.org/b/98994 http/tests/loading/text-content-type-with-binary-extension.html [ Failure ]
 
 # [Qt] some tests fail after unskipped in r131044
 # https://bugs.webkit.org/show_bug.cgi?id=99034

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 03cfdc72c45acaecea9a17c46b2c9cdf1bba1e84..af4d42a6bcbf6a96912ce4a4d13f52b036c3d9cc 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2012-10-11  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        REGRESSION (r129478-r129480): http/tests/loading/text-content-type-with-binary-extension.html failing on Apple MountainLion Debug WK2 (Tests)
+        https://bugs.webkit.org/show_bug.cgi?id=98527
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Added decidePolicyForResponse callback for WTR PagePolicyClient.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize):
+        (WTR::TestController::decidePolicyForResponse):
+        (WTR):
+        * WebKitTestRunner/TestController.h:
+        (TestController):
+
 2012-10-11  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
 
         [Qt] Make sure that -Wno-c++0x-compat is set even with production_build

diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index b44e4bbc83f76ceaba8ad62174ddcd58e8478294..f6f6375ece5839f4df2eab95e4863d9098ed51cb 100644 (file)
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -440,7 +440,7 @@ void TestController::initialize(int argc, const char* argv[])
         this,
         decidePolicyForNavigationAction,
         0, // decidePolicyForNewWindowAction
-        0, // decidePolicyForResponse
+        decidePolicyForResponse,
         0, // unableToImplementPolicy
     };
     WKPageSetPagePolicyClient(m_mainWebView->page(), &pagePolicyClient);
@@ -1070,4 +1070,15 @@ void TestController::decidePolicyForNavigationAction(WKFramePolicyListenerRef li
     WKFramePolicyListenerUse(listener);
 }
 
+void TestController::decidePolicyForResponse(WKPageRef, WKFrameRef, WKURLResponseRef, WKURLRequestRef, WKFramePolicyListenerRef listener, WKTypeRef, const void* clientInfo)
+{
+    static_cast<TestController*>(const_cast<void*>(clientInfo))->decidePolicyForResponse(listener);
+}
+
+void TestController::decidePolicyForResponse(WKFramePolicyListenerRef listener)
+{
+    // Response was already checked by WKBundlePagePolicyClient, so if we are here we're supposed to ignore.
+    WKFramePolicyListenerIgnore(listener);
+}
+
 } // namespace WTR

diff --git a/Tools/WebKitTestRunner/TestController.h b/Tools/WebKitTestRunner/TestController.h
index fd65b7bff80f9f6fddfa1eb550bfa374ce4ce01d..14de12002f705c79463c220645f842abb605e858 100644 (file)
--- a/Tools/WebKitTestRunner/TestController.h
+++ b/Tools/WebKitTestRunner/TestController.h
@@ -117,6 +117,9 @@ private:
     static void decidePolicyForNavigationAction(WKPageRef, WKFrameRef, WKFrameNavigationType, WKEventModifiers, WKEventMouseButton, WKURLRequestRef, WKFramePolicyListenerRef, WKTypeRef, const void*);
     void decidePolicyForNavigationAction(WKFramePolicyListenerRef);
 
+    static void decidePolicyForResponse(WKPageRef, WKFrameRef, WKURLResponseRef, WKURLRequestRef, WKFramePolicyListenerRef, WKTypeRef, const void*);
+    void decidePolicyForResponse(WKFramePolicyListenerRef);
+
     static WKPageRef createOtherPage(WKPageRef oldPage, WKURLRequestRef, WKDictionaryRef, WKEventModifiers, WKEventMouseButton, const void*);
 
     static void runModal(WKPageRef, const void* clientInfo);