[Qt][WK2] Compute and set cache capacities using the current CacheModel

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

Patch by Michael Brüning <michael.bruning@nokia.com> on 2012-02-08
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

* UIProcess/WebContext.cpp:
(WebKit::WebContext::WebContext): Set default cacheModel for Qt platform to
CacheModelPrimaryWebBrowser.

LayoutTests:

* platform/qt-wk2/Skipped: Unskip tests skipped for regression from r106920.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 328ea81..7714167 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2012-02-08  Michael Brüning  <michael.bruning@nokia.com>
+
+        [Qt][WK2] Compute and set cache capacities using the current CacheModel
+        https://bugs.webkit.org/show_bug.cgi?id=73918
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * platform/qt-wk2/Skipped: Unskip tests skipped for regression from r106920.
+
 2012-02-08  Pavel Podivilov  <podivilov@chromium.org>
 
         Unreviewed, add chromium expectations for fast/forms/select-overflow-scroll* tests.

diff --git a/LayoutTests/platform/qt-wk2/Skipped b/LayoutTests/platform/qt-wk2/Skipped
index 434c089..3426811 100644 (file)
--- a/LayoutTests/platform/qt-wk2/Skipped
+++ b/LayoutTests/platform/qt-wk2/Skipped
@@ -422,16 +422,3 @@ http/tests/loading/progress-finished-callback.html
 fast/history/form-submit-in-frame-via-onclick.html
 fast/history/form-submit-in-frame.html
 http/tests/loading/state-object-security-exception.html
-
-# REGRESSION(r106920) - https://bugs.webkit.org/show_bug.cgi?id=73918
-canvas/philip/tests/2d.pattern.modify.image1.html
-fast/events/pagehide-timeout.html
-fast/events/pageshow-pagehide-on-back-cached-with-frames.html
-fast/events/pageshow-pagehide-on-back-cached.html
-fast/harness/page-cache-crash-on-data-urls.html
-fast/harness/use-page-cache.html
-http/tests/cache/post-redirect-get.php
-http/tests/security/xhr-cors-redirect.html
-http/tests/xmlhttprequest/access-control-and-redirects.html
-http/tests/xmlhttprequest/xmlhttprequest-unsafe-redirect.html
-svg/animations/animate-color-fill-from-by.html

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 8b7d262..2433032 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2012-02-08  Michael Brüning  <michael.bruning@nokia.com>
+
+        [Qt][WK2] Compute and set cache capacities using the current CacheModel
+        https://bugs.webkit.org/show_bug.cgi?id=73918
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::WebContext): Set default cacheModel for Qt platform to
+        CacheModelPrimaryWebBrowser.
+
 2012-02-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Fix WebKitWebView::decide-policy API documentation

diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
index 23ca56b..7c09f1f 100644 (file)
--- a/Source/WebKit2/UIProcess/WebContext.cpp
+++ b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -122,7 +122,11 @@ WebContext::WebContext(ProcessModel processModel, const String& injectedBundlePa
     , m_visitedLinkProvider(this)
     , m_alwaysUsesComplexTextCodePath(false)
     , m_shouldUseFontSmoothing(true)
+#if PLATFORM(QT)
+    , m_cacheModel(CacheModelPrimaryWebBrowser)
+#else
     , m_cacheModel(CacheModelDocumentViewer)
+#endif
     , m_memorySamplerEnabled(false)
     , m_memorySamplerInterval(1400.0)
     , m_applicationCacheManagerProxy(WebApplicationCacheManagerProxy::create(this))