Changeset 50938 in webkit

Timestamp:

Nov 13, 2009 5:49:29 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-13 Andras Becsi <​becsi.andras@stud.u-szeged.hu>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Enable Page Cache if setMaximumPagesInCache needs it.
This fixes ​https://bugs.webkit.org/show_bug.cgi?id=31266.

• Api/qwebsettings.cpp: (QWebSettingsPrivate::apply): (QWebSettings::setMaximumPagesInCache):

2009-11-13 Andras Becsi <​becsi.andras@stud.u-szeged.hu>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Add WebKitUsesPageCachePreferenceKey overriding support to DRT's LayoutTestController.

• DumpRenderTree/qt/DumpRenderTree.cpp: (WebCore::WebPage::resetSettings):
• DumpRenderTree/qt/LayoutTestControllerQt.cpp: (LayoutTestController::overridePreference):

Location:

trunk

Files:

• WebKit/qt/Api/qwebsettings.cpp (modified) (2 diffs)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp (modified) (2 diffs)
• WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (1 diff)

trunk/WebKit/qt/Api/qwebsettings.cpp

@@ -199 +199 @@
                                       global->attributes.value(QWebSettings::LocalContentCanAccessRemoteUrls));
         settings->setAllowUniversalAccessFromFileURLs(value);
+        settings->setUsesPageCache(WebCore::pageCache()->capacity());
     } else {
         QList<QWebSettingsPrivate*> settings = *::allSettings();
@@ -641 +642 @@
 void QWebSettings::setMaximumPagesInCache(int pages)
 {
+    QWebSettingsPrivate* global = QWebSettings::globalSettings()->d;
     WebCore::pageCache()->setCapacity(qMax(0, pages));
+    global->apply();
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-11-13  Andras Becsi  <becsi.andras@stud.u-szeged.hu>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Enable Page Cache if setMaximumPagesInCache needs it.
+        This fixes https://bugs.webkit.org/show_bug.cgi?id=31266.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+        (QWebSettings::setMaximumPagesInCache):
+
 2009-11-13  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-13  Andras Becsi  <becsi.andras@stud.u-szeged.hu>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add WebKitUsesPageCachePreferenceKey overriding support to DRT's LayoutTestController.
+
+        * DumpRenderTree/qt/DumpRenderTree.cpp:
+        (WebCore::WebPage::resetSettings):
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::overridePreference):
+
 2009-11-13  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/qt/DumpRenderTree.cpp

@@ -141 +141 @@
 
     settings()->resetFontSize(QWebSettings::DefaultFontSize);
-
     settings()->resetAttribute(QWebSettings::JavascriptCanOpenWindows);
     settings()->resetAttribute(QWebSettings::JavascriptEnabled);
@@ -147 +146 @@
     settings()->resetAttribute(QWebSettings::LinksIncludedInFocusChain);
     settings()->resetAttribute(QWebSettings::OfflineWebApplicationCacheEnabled);
+    QWebSettings::setMaximumPagesInCache(0); // reset to default
 }
 

trunk/WebKitTools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -327 +327 @@
     else if (name == "WebKitDefaultFontSize")
         settings->setFontSize(QWebSettings::DefaultFontSize, value.toInt());
-}
+    else if (name == "WebKitUsesPageCachePreferenceKey")
+        QWebSettings::setMaximumPagesInCache(value.toInt());
+}