[WK2] Set WebKitTestRunner's WebProcess cache model to DocumentBrowser.

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

Patch by Zalan Bujtas <zbujtas@gmail.com> on 2012-04-14
Reviewed by Dan Bernstein.

Tools:

WebProcess's default cache model is DocumentViewer. When DocumentViewer model is on,
the PageCache's capacity is set to 0. Tests that are enabling 'WebKitUsesPageCachePreferenceKey' expect
PageCache to be functional.

* WebKitTestRunner/TestController.cpp:
(WTR::TestController::resetStateToConsistentValues):

LayoutTests:

Re-enable 2 tests where WebKitUsesPageCachePreferenceKey is set.

* platform/mac-wk2/Skipped:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 49b068a..30b69c4 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2012-04-14  Zalan Bujtas  <zbujtas@gmail.com>
+
+        [WK2] Set WebKitTestRunner's WebProcess cache model to DocumentBrowser.
+        https://bugs.webkit.org/show_bug.cgi?id=81945
+
+        Reviewed by Dan Bernstein.
+
+        Re-enable 2 tests where WebKitUsesPageCachePreferenceKey is set.
+
+        * platform/mac-wk2/Skipped:
+
 2012-04-13  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r114036.

diff --git a/LayoutTests/platform/mac-wk2/Skipped b/LayoutTests/platform/mac-wk2/Skipped
index a637132..e3a8520 100644 (file)
--- a/LayoutTests/platform/mac-wk2/Skipped
+++ b/LayoutTests/platform/mac-wk2/Skipped
@@ -241,18 +241,10 @@ http/tests/xmlhttprequest/basic-auth.html
 http/tests/xmlhttprequest/re-login-async.html
 http/tests/xmlhttprequest/workers/abort-exception-assert.html
 
-# [WK2] fast/dom/Window/timer-resume-on-navigation-back.html times out
-# https://bugs.webkit.org/show_bug.cgi?id=81637
-fast/dom/Window/timer-resume-on-navigation-back.html
-
 # fast/events/drag-link.html is failing in Mac WebKit2
 # https://bugs.webkit.org/show_bug.cgi?id=81833
 fast/events/drag-link.html
 
-# fast/events/suspend-timers.html is failing in Mac WebKit2, even though LayoutTestController.overridePreference is implemented in WebKitTestRunner
-# https://bugs.webkit.org/show_bug.cgi?id=81945
-fast/events/suspend-timers.html
-
 # appcache tests often fail on the Mac WebKit2 bot
 # https://bugs.webkit.org/show_bug.cgi?id=82061 rdar://problem/11108649
 http/tests/appcache

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 84fcf07..c4a5836 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2012-04-14  Zalan Bujtas  <zbujtas@gmail.com>
+
+        [WK2] Set WebKitTestRunner's WebProcess cache model to DocumentBrowser.
+        https://bugs.webkit.org/show_bug.cgi?id=81945
+
+        Reviewed by Dan Bernstein.
+
+        WebProcess's default cache model is DocumentViewer. When DocumentViewer model is on,
+        the PageCache's capacity is set to 0. Tests that are enabling 'WebKitUsesPageCachePreferenceKey' expect
+        PageCache to be functional.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetStateToConsistentValues):
+
 2012-04-11  James Robinson  <jamesr@chromium.org>
 
         [chromium] Remove unused compositeToTexture / compositeOffscreen setting

diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
index 3c80f9a..68690e5 100644 (file)
--- a/Tools/WebKitTestRunner/TestController.cpp
+++ b/Tools/WebKitTestRunner/TestController.cpp
@@ -432,6 +432,8 @@ bool TestController::resetStateToConsistentValues()
 
     WKContextSetShouldUseFontSmoothing(TestController::shared().context(), false);
 
+    WKContextSetCacheModel(TestController::shared().context(), kWKCacheModelDocumentBrowser);
+
     // FIXME: This function should also ensure that there is only one page open.
 
     // Reset preferences