Title: [91635] trunk/Tools
- Revision
- 91635
- Author
- [email protected]
- Date
- 2011-07-23 08:39:47 -0700 (Sat, 23 Jul 2011)
Log Message
[Qt] Add option to turn on disk caching in QtTestBrowser
https://bugs.webkit.org/show_bug.cgi?id=65007
Patch by Keith Kyzivat <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91634 => 91635)
--- trunk/Tools/ChangeLog 2011-07-23 14:54:52 UTC (rev 91634)
+++ trunk/Tools/ChangeLog 2011-07-23 15:39:47 UTC (rev 91635)
@@ -1,3 +1,23 @@
+2011-07-23 Keith Kyzivat <[email protected]>
+
+ [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 <[email protected]>
Don't match 'DEBUG' when trying to filter BUG modifiers.
Modified: trunk/Tools/QtTestBrowser/launcherwindow.cpp (91634 => 91635)
--- trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-07-23 14:54:52 UTC (rev 91634)
+++ trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-07-23 15:39:47 UTC (rev 91635)
@@ -42,6 +42,9 @@
#include <QNetworkReply>
#endif
+#include <QtGui/QDesktopServices>
+#include <QtNetwork/QNetworkDiskCache>
+
const int gExitClickArea = 80;
QVector<int> LauncherWindow::m_zoomLevels;
@@ -115,6 +118,7 @@
m_inputUrl = addressUrl();
QUrl url = ""
setPage(new WebPage(this));
+ setDiskCache(m_windowOptions.useDiskCache);
QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
@@ -412,6 +416,10 @@
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)));
toggleAutoLoadImages->setCheckable(true);
toggleAutoLoadImages->setChecked(false);
@@ -786,6 +794,18 @@
#endif
}
+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)
{
m_touchMocking = on;
Modified: trunk/Tools/QtTestBrowser/launcherwindow.h (91634 => 91635)
--- trunk/Tools/QtTestBrowser/launcherwindow.h 2011-07-23 14:54:52 UTC (rev 91634)
+++ trunk/Tools/QtTestBrowser/launcherwindow.h 2011-07-23 15:39:47 UTC (rev 91635)
@@ -80,7 +80,8 @@
class WindowOptions {
public:
WindowOptions()
- : useGraphicsView(false)
+ : useDiskCache(false)
+ , useGraphicsView(false)
, useCompositing(true)
, useTiledBackingStore(false)
, useWebGL(false)
@@ -112,6 +113,7 @@
{
}
+ bool useDiskCache;
bool useGraphicsView;
bool useCompositing;
bool useTiledBackingStore;
@@ -173,6 +175,7 @@
void loadURLListFromFile();
+ void setDiskCache(bool enable);
void setTouchMocking(bool on);
void toggleWebView(bool graphicsBased);
void toggleAcceleratedCompositing(bool toggle);
Modified: trunk/Tools/QtTestBrowser/main.cpp (91634 => 91635)
--- trunk/Tools/QtTestBrowser/main.cpp 2011-07-23 14:54:52 UTC (rev 91634)
+++ trunk/Tools/QtTestBrowser/main.cpp 2011-07-23 15:39:47 UTC (rev 91635)
@@ -182,6 +182,7 @@
<< "[-webgl]"
#endif
<< QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
+ << "[-disk-cache]"
<< "[-cache-webview]"
<< "[-maximize]"
<< "[-show-fps]"
@@ -217,6 +218,9 @@
windowOptions.showFrameRate = true;
}
+ if (args.contains("-disk-cache"))
+ windowOptions.useDiskCache = true;
+
if (args.contains("-cache-webview") || defaultForAnimations) {
requiresGraphicsView("-cache-webview");
windowOptions.cacheWebView = true;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
