Title: [91649] trunk/Tools
- Revision
- 91649
- Author
- [email protected]
- Date
- 2011-07-24 12:49:29 -0700 (Sun, 24 Jul 2011)
Log Message
Unreviewed, rolling out r91635.
http://trac.webkit.org/changeset/91635
https://bugs.webkit.org/show_bug.cgi?id=65083
It broke the minimal build (Requested by Ossy___OFFLINE on
#webkit).
Patch by Sheriff Bot <[email protected]> on 2011-07-24
* QtTestBrowser/launcherwindow.cpp:
(LauncherWindow::initializeView):
(LauncherWindow::createChrome):
* QtTestBrowser/launcherwindow.h:
(WindowOptions::WindowOptions):
* QtTestBrowser/main.cpp:
(LauncherApplication::handleUserOptions):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91648 => 91649)
--- trunk/Tools/ChangeLog 2011-07-24 18:48:54 UTC (rev 91648)
+++ trunk/Tools/ChangeLog 2011-07-24 19:49:29 UTC (rev 91649)
@@ -1,3 +1,20 @@
+2011-07-24 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r91635.
+ http://trac.webkit.org/changeset/91635
+ https://bugs.webkit.org/show_bug.cgi?id=65083
+
+ It broke the minimal build (Requested by Ossy___OFFLINE on
+ #webkit).
+
+ * QtTestBrowser/launcherwindow.cpp:
+ (LauncherWindow::initializeView):
+ (LauncherWindow::createChrome):
+ * QtTestBrowser/launcherwindow.h:
+ (WindowOptions::WindowOptions):
+ * QtTestBrowser/main.cpp:
+ (LauncherApplication::handleUserOptions):
+
2011-07-24 Adam Barth <[email protected]>
Rename garden-o-matic "alert" to "infobar" and increase the width to 100%.
Modified: trunk/Tools/QtTestBrowser/launcherwindow.cpp (91648 => 91649)
--- trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-07-24 18:48:54 UTC (rev 91648)
+++ trunk/Tools/QtTestBrowser/launcherwindow.cpp 2011-07-24 19:49:29 UTC (rev 91649)
@@ -42,9 +42,6 @@
#include <QNetworkReply>
#endif
-#include <QtGui/QDesktopServices>
-#include <QtNetwork/QNetworkDiskCache>
-
const int gExitClickArea = 80;
QVector<int> LauncherWindow::m_zoomLevels;
@@ -118,7 +115,6 @@
m_inputUrl = addressUrl();
QUrl url = ""
setPage(new WebPage(this));
- setDiskCache(m_windowOptions.useDiskCache);
QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
@@ -416,10 +412,6 @@
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);
@@ -794,18 +786,6 @@
#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 (91648 => 91649)
--- trunk/Tools/QtTestBrowser/launcherwindow.h 2011-07-24 18:48:54 UTC (rev 91648)
+++ trunk/Tools/QtTestBrowser/launcherwindow.h 2011-07-24 19:49:29 UTC (rev 91649)
@@ -80,8 +80,7 @@
class WindowOptions {
public:
WindowOptions()
- : useDiskCache(false)
- , useGraphicsView(false)
+ : useGraphicsView(false)
, useCompositing(true)
, useTiledBackingStore(false)
, useWebGL(false)
@@ -113,7 +112,6 @@
{
}
- bool useDiskCache;
bool useGraphicsView;
bool useCompositing;
bool useTiledBackingStore;
@@ -175,7 +173,6 @@
void loadURLListFromFile();
- void setDiskCache(bool enable);
void setTouchMocking(bool on);
void toggleWebView(bool graphicsBased);
void toggleAcceleratedCompositing(bool toggle);
Modified: trunk/Tools/QtTestBrowser/main.cpp (91648 => 91649)
--- trunk/Tools/QtTestBrowser/main.cpp 2011-07-24 18:48:54 UTC (rev 91648)
+++ trunk/Tools/QtTestBrowser/main.cpp 2011-07-24 19:49:29 UTC (rev 91649)
@@ -182,7 +182,6 @@
<< "[-webgl]"
#endif
<< QString("[-viewport-update-mode %1]").arg(formatKeys(updateModes)).toLatin1().data()
- << "[-disk-cache]"
<< "[-cache-webview]"
<< "[-maximize]"
<< "[-show-fps]"
@@ -218,9 +217,6 @@
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
