Changeset 92478 in webkit

Timestamp:

Aug 5, 2011 7:03:41 AM (13 years ago)

Author:

Ademar Reis

Message:

[Qt] QtTestBrowser: Add support for saving cookies on disk
​https://bugs.webkit.org/show_bug.cgi?id=65328

Simple cookiejar that saves cookies on disk.

Added menu options to clear cookies (Edit->Clear cookies) and
disable disk cookies (Settings->[ ]Save Cookies on Disk).

Option -no-disk-cookies is also available.

Reviewed by Andreas Kling.

• QtTestBrowser/QtTestBrowser.pro:
• QtTestBrowser/cookiejar.cpp: Added.
• QtTestBrowser/cookiejar.h: Added.
• QtTestBrowser/launcherwindow.cpp:
• QtTestBrowser/launcherwindow.h:
• QtTestBrowser/main.cpp:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/QtTestBrowser.pro (modified) (2 diffs)
• QtTestBrowser/cookiejar.cpp (added)
• QtTestBrowser/cookiejar.h (added)
• QtTestBrowser/launcherwindow.cpp (modified) (6 diffs)
• QtTestBrowser/launcherwindow.h (modified) (3 diffs)
• QtTestBrowser/main.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-08-05  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>
+
+        [Qt] QtTestBrowser: Add support for saving cookies on disk
+        https://bugs.webkit.org/show_bug.cgi?id=65328
+
+        Simple cookiejar that saves cookies on disk.
+
+        Added menu options to clear cookies (Edit->Clear cookies) and
+        disable disk cookies (Settings->[ ]Save Cookies on Disk).
+
+        Option -no-disk-cookies is also available.
+
+        Reviewed by Andreas Kling.
+
+        * QtTestBrowser/QtTestBrowser.pro:
+        * QtTestBrowser/cookiejar.cpp: Added.
+        * QtTestBrowser/cookiejar.h: Added.
+        * QtTestBrowser/launcherwindow.cpp:
+        * QtTestBrowser/launcherwindow.h:
+        * QtTestBrowser/main.cpp:
+
 2011-08-04  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/QtTestBrowser/QtTestBrowser.pro

@@ -11 +11 @@
     webview.cpp \
     fpstimer.cpp \
+    cookiejar.cpp
 
 HEADERS += \
@@ -22 +23 @@
     webview.h \
     fpstimer.h \
+    cookiejar.h
 
 !isEqual(QT_ARCH,sh4): CONFIG += uitools

trunk/Tools/QtTestBrowser/launcherwindow.cpp

@@ -34 +34 @@
 
 #include "launcherwindow.h"
+#include "cookiejar.h"
 #include "urlloader.h"
+
+#include <QCoreApplication>
 
 #if !defined(QT_NO_FILEDIALOG) && !defined(QT_NO_MESSAGEBOX)
@@ -50 +53 @@
 const int gExitClickArea = 80;
 QVector<int> LauncherWindow::m_zoomLevels;
+
+static TestBrowserCookieJar* testBrowserCookieJarInstance()
+{
+    static TestBrowserCookieJar* cookieJar = new TestBrowserCookieJar(qApp);
+    return cookieJar;
+}
 
 LauncherWindow::LauncherWindow(WindowOptions* data, QGraphicsScene* sharedScene)
@@ -122 +131 @@
     setPage(new WebPage(this));
     setDiskCache(m_windowOptions.useDiskCache);
+    setUseDiskCookies(m_windowOptions.useDiskCookies);
+
+    // We reuse the same cookieJar on multiple QNAMs, which is OK.
+    QObject* cookieJarParent = testBrowserCookieJarInstance()->parent();
+    page()->networkAccessManager()->setCookieJar(testBrowserCookieJarInstance());
+    testBrowserCookieJarInstance()->setParent(cookieJarParent);
 
     QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
@@ -226 +241 @@
     QAction* setEditable = editMenu->addAction("Set Editable", this, SLOT(setEditable(bool)));
     setEditable->setCheckable(true);
+
+    editMenu->addAction("Clear Cookies", this, SLOT(clearCookies()));
 
     QMenu* viewMenu = menuBar()->addMenu("&View");
@@ -440 +457 @@
     toggleJavascriptCanOpenWindows->setCheckable(true);
     toggleJavascriptCanOpenWindows->setChecked(false);
+
+    QAction* toggleUseDiskCookies = settingsMenu->addAction("Save Cookies on Disk", this, SLOT(setUseDiskCookies(bool)));
+    toggleUseDiskCookies->setCheckable(true);
+    toggleUseDiskCookies->setChecked(m_windowOptions.useDiskCookies);
+
 #ifndef QT_NO_LINEEDIT
     m_findBar = new QToolBar("Find", this);
@@ -886 +908 @@
 }
 
+void LauncherWindow::setUseDiskCookies(bool enable)
+{
+    testBrowserCookieJarInstance()->setDiskStorageEnabled(enable);
+}
+
+void LauncherWindow::clearCookies()
+{
+    testBrowserCookieJarInstance()->reset();
+}
+
 void LauncherWindow::toggleAutoLoadImages(bool enable)
 {

trunk/Tools/QtTestBrowser/launcherwindow.h

@@ -98 +98 @@
         , useOfflineStorageDatabase(false)
         , useOfflineWebApplicationCache(false)
+        , useDiskCookies(true)
         , offlineStorageDefaultQuotaSize(0)
 #if defined(QT_CONFIGURED_WITH_OPENGL)
@@ -127 +128 @@
     bool useOfflineStorageDatabase;
     bool useOfflineWebApplicationCache;
+    bool useDiskCookies;
     quint64 offlineStorageDefaultQuotaSize;
 #if defined(QT_CONFIGURED_WITH_OPENGL)
@@ -189 +191 @@
     void toggleJavascriptCanOpenWindows(bool enable);
     void toggleAutoLoadImages(bool enable);
+    void setUseDiskCookies(bool enable);
+    void clearCookies();
     void togglePlugins(bool enable);
     void toggleLocalStorage(bool toggle);

trunk/Tools/QtTestBrowser/main.cpp

@@ -196 +196 @@
              << "[-resizes-to-contents]"
              << "[-local-storage-enabled]"
+             << "[-no-disk-cookies]"
              << "[-offline-storage-database-enabled]"
              << "[-offline-web-application-cache-enabled]"
@@ -246 +247 @@
     if (args.contains("-local-storage-enabled"))
         windowOptions.useLocalStorage = true;
-        
+
+    if (args.contains("-no-disk-cookies"))
+        windowOptions.useDiskCookies = false;
+
     if (args.contains("-maximize"))
         windowOptions.startMaximized = true;