Changeset 91635 in webkit

Timestamp:

Jul 23, 2011 8:39:47 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Add option to turn on disk caching in QtTestBrowser
​https://bugs.webkit.org/show_bug.cgi?id=65007

Patch by Keith Kyzivat <​keith.kyzivat@nokia.com> on 2011-07-23
Reviewed by Noam Rosenthal.

Add menu item and command line option to turn on disk caching in
QtTestBrowser. Simple QNetworkDiskCache added to the page's
QNetworkAccssManager.

• QtTestBrowser/launcherwindow.cpp:

(LauncherWindow::initializeView):
(LauncherWindow::createChrome):
(LauncherWindow::setDiskCache):

• QtTestBrowser/launcherwindow.h:

(WindowOptions::WindowOptions):

• QtTestBrowser/main.cpp:

(LauncherApplication::handleUserOptions):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.cpp (modified) (4 diffs)
• QtTestBrowser/launcherwindow.h (modified) (3 diffs)
• QtTestBrowser/main.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-23  Keith Kyzivat  <keith.kyzivat@nokia.com>
+
+        [Qt] Add option to turn on disk caching in QtTestBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=65007
+
+        Reviewed by Noam Rosenthal.
+
+        Add menu item and command line option to turn on disk caching in
+        QtTestBrowser. Simple QNetworkDiskCache added to the page's
+        QNetworkAccssManager.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::initializeView):
+        (LauncherWindow::createChrome):
+        (LauncherWindow::setDiskCache):
+        * QtTestBrowser/launcherwindow.h:
+        (WindowOptions::WindowOptions):
+        * QtTestBrowser/main.cpp:
+        (LauncherApplication::handleUserOptions):
+
 2011-07-22  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/QtTestBrowser/launcherwindow.cpp

@@ -43 +43 @@
 #endif
 
+#include <QtGui/QDesktopServices>
+#include <QtNetwork/QNetworkDiskCache>
+
 const int gExitClickArea = 80;
 QVector<int> LauncherWindow::m_zoomLevels;
@@ -116 +119 @@
     QUrl url = page()->mainFrame()->url();
     setPage(new WebPage(this));
+    setDiskCache(m_windowOptions.useDiskCache);
 
     QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
@@ -412 +416 @@
 
     QMenu* settingsMenu = menuBar()->addMenu("&Settings");
+
+    QAction* toggleDiskCache = settingsMenu->addAction("Use Disk Cache", this, SLOT(setDiskCache(bool)));
+    toggleDiskCache->setCheckable(true);
+    toggleDiskCache->setChecked(m_windowOptions.useDiskCache);
 
     QAction* toggleAutoLoadImages = settingsMenu->addAction("Disable Auto Load Images", this, SLOT(toggleAutoLoadImages(bool)));
@@ -787 +795 @@
 }
 
+void LauncherWindow::setDiskCache(bool enable)
+{
+    m_windowOptions.useDiskCache = enable;
+    QNetworkDiskCache* cache = 0;
+    if (enable) {
+        cache = new QNetworkDiskCache();
+        QString cacheLocation = QDesktopServices::storageLocation(QDesktopServices::CacheLocation);
+        cache->setCacheDirectory(cacheLocation);
+    }
+    page()->networkAccessManager()->setCache(cache);
+}
+
 void LauncherWindow::setTouchMocking(bool on)
 {

trunk/Tools/QtTestBrowser/launcherwindow.h

@@ -81 +81 @@
 public:
     WindowOptions()
-        : useGraphicsView(false)
+        : useDiskCache(false)
+        , useGraphicsView(false)
         , useCompositing(true)
         , useTiledBackingStore(false)
@@ -113 +114 @@
     }
 
+    bool useDiskCache;
     bool useGraphicsView;
     bool useCompositing;
@@ -174 +176 @@
     void loadURLListFromFile();
 
+    void setDiskCache(bool enable);
     void setTouchMocking(bool on);
     void toggleWebView(bool graphicsBased);

trunk/Tools/QtTestBrowser/main.cpp

@@ -183 +183 @@
 #endif
              << QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
+             << "[-disk-cache]"
              << "[-cache-webview]"
              << "[-maximize]"
@@ -218 +219 @@
     }
 
+    if (args.contains("-disk-cache"))
+        windowOptions.useDiskCache = true;
+
     if (args.contains("-cache-webview") || defaultForAnimations) {
         requiresGraphicsView("-cache-webview");