Changeset 39863 in webkit

Timestamp:

Jan 13, 2009 9:58:57 AM (15 years ago)

Author:

Simon Hausmann

Message:

2009-01-13 Simon Hausmann <​simon.hausmann@nokia.com>

Reviewed by Tor Arne Vestbø.

​https://bugs.webkit.org/show_bug.cgi?id=23171

Based on patch by Yael Aharon <​yael.aharon@nokia.com>

Make the QWebSettings functions for setting the path for the local
storage database private QtWebkit API, including the ability to
associated a QWebPage with a named page group.

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (2 diffs)
• Api/qwebpage.h (modified) (1 diff)
• Api/qwebsettings.cpp (modified) (3 diffs)
• Api/qwebsettings.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• tests/qwebpage/tst_qwebpage.cpp (modified) (3 diffs)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -101 +101 @@
 {
     QWebPagePrivate::drtRun = b;
+}
+
+void QWEBKIT_EXPORT qt_webpage_setGroupName(QWebPage* page, const QString& groupName)
+{
+    page->handle()->page->setGroupName(groupName);
+}
+
+QString QWEBKIT_EXPORT qt_webpage_groupName(QWebPage* page)
+{
+    return page->handle()->page->groupName();
 }
 
@@ -2652 +2662 @@
 */
 
+/*!
+  \fn QWebPagePrivate* QWebPage::handle() const
+  \internal
+*/
 
 #include "moc_qwebpage.cpp"

trunk/WebKit/qt/Api/qwebpage.h

@@ -270 +270 @@
     virtual bool supportsExtension(Extension extension) const;
 
+    inline QWebPagePrivate* handle() const { return d; }
+
 Q_SIGNALS:
     void loadStarted();

trunk/WebKit/qt/Api/qwebsettings.cpp

@@ -730 +730 @@
 }
 
-/*!
+/*
     \since 4.5
 
@@ -741 +741 @@
     \sa localStorageDatabasePath()
 */
-void QWebSettings::setLocalStorageDatabasePath(const QString& path)
-{
-    QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
-    global->localStorageDatabasePath = path;
+
+void QWEBKIT_EXPORT qt_websettings_setLocalStorageDatabasePath(QWebSettings* settings, const QString& path)
+{
+    QWebSettingsPrivate *d = settings->handle();
+    d->localStorageDatabasePath = path;
     d->apply();
 }
 
-/*!
+/*
     \since 4.5
 
@@ -756 +757 @@
     \sa setLocalStorageDatabasePath()
 */
-QString QWebSettings::localStorageDatabasePath() const
-{
-    QWebSettingsPrivate *global = QWebSettings::globalSettings()->d;
-    return global->localStorageDatabasePath;
-}
+QString QWEBKIT_EXPORT qt_websettings_localStorageDatabasePath(QWebSettings* settings)
+{
+    return settings->handle()->localStorageDatabasePath;
+}
+
+/*!
+    \fn QWebSettingsPrivate* QWebSettings::handle() const
+    \internal
+*/

trunk/WebKit/qt/Api/qwebsettings.h

@@ -116 +116 @@
     static QString offlineWebApplicationCachePath();
 
-    void setLocalStorageDatabasePath(const QString& path);
-    QString localStorageDatabasePath() const;
+    inline QWebSettingsPrivate* handle() const { return d; }
 
 private:

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-01-13  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        https://bugs.webkit.org/show_bug.cgi?id=23171
+
+        Based on patch by Yael Aharon  <yael.aharon@nokia.com>
+
+        Make the QWebSettings functions for setting the path for the local
+        storage database private QtWebkit API, including the ability to
+        associated a QWebPage with a named page group.
+
+        * Api/qwebpage.cpp:
+        (qt_webpage_setGroupName): Added.
+        (qt_webpage_groupName): Added.
+        * Api/qwebpage.h:
+        (ExtensionOption::handle): Added internal helper function.
+        * Api/qwebsettings.cpp:
+        (qt_websettings_setLocalStorageDatabasePath): Made private API.
+        (qt_websettings_localStorageDatabasePath): Made private API.
+        * Api/qwebsettings.h:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::database): Small cleanup.
+        (tst_QWebPage::multiplePageGroupsAndLocalStorage): New test for the
+        page group handling, written by Yael.
+
 2009-01-12  Tor Arne Vestbø  <tavestbo@trolltech.com>
 

trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -101 +101 @@
     void destroyPlugin();
     void createViewlessPlugin();
+    void multiplePageGroupsAndLocalStorage();
 
 private:
@@ -370 +371 @@
     QWebSettings::setOfflineStorageDefaultQuota(1024 * 1024);
     QVERIFY(QWebSettings::offlineStorageDefaultQuota() == 1024 * 1024);
-
-    m_page->settings()->setOfflineWebApplicationCachePath(path);
-    QVERIFY(m_page->settings()->offlineWebApplicationCachePath() == path);
-
-    m_page->settings()->setLocalStorageDatabasePath(path);
-    QVERIFY(m_page->settings()->localStorageDatabasePath() == path);
 
     QString dbFileName = path + "Databases.db";
@@ -596 +591 @@
 }
 
+// import private API
+void QWEBKIT_EXPORT qt_webpage_setGroupName(QWebPage* page, const QString& groupName);
+QString QWEBKIT_EXPORT qt_webpage_groupName(QWebPage* page);
+void QWEBKIT_EXPORT qt_websettings_setLocalStorageDatabasePath(QWebSettings* settings, const QString& path);
+
+void tst_QWebPage::multiplePageGroupsAndLocalStorage()
+{
+    QDir dir(QDir::currentPath());
+    dir.mkdir("path1");
+    dir.mkdir("path2");
+
+    QWebView view1;
+    QWebView view2;
+
+    qt_websettings_setLocalStorageDatabasePath(view1.page()->settings(), QDir::toNativeSeparators(QDir::currentPath() + "/path1"));
+    qt_webpage_setGroupName(view1.page(), "group1");
+    qt_websettings_setLocalStorageDatabasePath(view2.page()->settings(), QDir::toNativeSeparators(QDir::currentPath() + "/path2"));
+    qt_webpage_setGroupName(view2.page(), "group2");
+    QCOMPARE(qt_webpage_groupName(view1.page()), QString("group1"));
+    QCOMPARE(qt_webpage_groupName(view2.page()), QString("group2"));
+
+
+    view1.setHtml(QString("<html><body> </body></html>"), QUrl("http://www.myexample.com"));
+    view2.setHtml(QString("<html><body> </body></html>"), QUrl("http://www.myexample.com"));
+
+    view1.page()->mainFrame()->evaluateJavaScript("localStorage.test='value1';");
+    view2.page()->mainFrame()->evaluateJavaScript("localStorage.test='value2';");
+
+    view1.setHtml(QString("<html><body> </body></html>"), QUrl("http://www.myexample.com"));
+    view2.setHtml(QString("<html><body> </body></html>"), QUrl("http://www.myexample.com"));
+
+    QVariant s1 = view1.page()->mainFrame()->evaluateJavaScript("localStorage.test");
+    QCOMPARE(s1.toString(), QString("value1"));
+
+    QVariant s2 = view2.page()->mainFrame()->evaluateJavaScript("localStorage.test");
+    QCOMPARE(s2.toString(), QString("value2"));
+
+    QTest::qWait(1000);
+
+    QFile::remove(QDir::toNativeSeparators(QDir::currentPath() + "/path1/http_www.myexample.com_0.localstorage"));
+    QFile::remove(QDir::toNativeSeparators(QDir::currentPath() + "/path2/http_www.myexample.com_0.localstorage"));
+    dir.rmdir(QDir::toNativeSeparators("./path1"));
+    dir.rmdir(QDir::toNativeSeparators("./path2"));
+}
+
 QTEST_MAIN(tst_QWebPage)
 #include "tst_qwebpage.moc"