Changeset 91649 in webkit

Timestamp:

Jul 24, 2011, 12:49:29 PM (14 years ago)

Author:

commit-queue@webkit.org

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 <​webkit.review.bot@gmail.com> on 2011-07-24

• QtTestBrowser/launcherwindow.cpp:

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

• 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-24  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        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  <abarth@webkit.org>
 

trunk/Tools/QtTestBrowser/launcherwindow.cpp

@@ -43 +43 @@
 #endif
 
-#include <QtGui/QDesktopServices>
-#include <QtNetwork/QNetworkDiskCache>
-
 const int gExitClickArea = 80;
 QVector<int> LauncherWindow::m_zoomLevels;
@@ -119 +116 @@
     QUrl url = page()->mainFrame()->url();
     setPage(new WebPage(this));
-    setDiskCache(m_windowOptions.useDiskCache);
 
     QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
@@ -416 +412 @@
 
     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)));
@@ -795 +787 @@
 }
 
-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()
-        : useDiskCache(false)
-        , useGraphicsView(false)
+        : useGraphicsView(false)
         , useCompositing(true)
         , useTiledBackingStore(false)
@@ -114 +113 @@
     }
 
-    bool useDiskCache;
     bool useGraphicsView;
     bool useCompositing;
@@ -176 +174 @@
     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]"
@@ -219 +218 @@
     }
 
-    if (args.contains("-disk-cache"))
-        windowOptions.useDiskCache = true;
-
     if (args.contains("-cache-webview") || defaultForAnimations) {
         requiresGraphicsView("-cache-webview");