[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2b9f86d674a38244e2d08381eef0f62dfc154c93
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 19 14:34:39 2010 +0000

    2010-02-19  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] Clean-up the handling of HTML5 persistent data for LayoutTests
            https://bugs.webkit.org/show_bug.cgi?id=35004
    
            DumpRenderTreeQt.cpp calls QWebSettings::enablePersistentStorage which sets up
            and enables all HTML5 persistent data. All the other calls for setting the
            persistent path or enabling the persistent feature are redundant.
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::WebPage::WebPage): No need to enable AppCache again.
            * DumpRenderTree/qt/main.cpp:
            (main): No need to setup and enable HTML5 LocalStorage again.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55013 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f95dda7..cfa1557 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-02-19  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Clean-up the handling of HTML5 persistent data for LayoutTests
+        https://bugs.webkit.org/show_bug.cgi?id=35004
+
+        DumpRenderTreeQt.cpp calls QWebSettings::enablePersistentStorage which sets up 
+        and enables all HTML5 persistent data. All the other calls for setting the 
+        persistent path or enabling the persistent feature are redundant. 
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::WebPage): No need to enable AppCache again.
+        * DumpRenderTree/qt/main.cpp:
+        (main): No need to setup and enable HTML5 LocalStorage again.
+
 2010-02-19  Diego Gonzalez  <diego.gonzalez at openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 1cb08e4..43f1318 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -135,7 +135,6 @@ WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
     globalSettings->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true);
     globalSettings->setAttribute(QWebSettings::JavascriptEnabled, true);
     globalSettings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false);
-    globalSettings->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
 
     connect(this, SIGNAL(geometryChangeRequested(const QRect &)),
             this, SLOT(setViewGeometry(const QRect & )));
diff --git a/WebKitTools/DumpRenderTree/qt/main.cpp b/WebKitTools/DumpRenderTree/qt/main.cpp
index efcda57..7d72982 100644
--- a/WebKitTools/DumpRenderTree/qt/main.cpp
+++ b/WebKitTools/DumpRenderTree/qt/main.cpp
@@ -37,9 +37,7 @@
 #include <qdir.h>
 #include <qdebug.h>
 #include <qfont.h>
-#include <qwebsettings.h>
 #include <qwebdatabase.h>
-#include <qdesktopservices.h>
 #include <qtimer.h>
 #include <qwindowsstyle.h>
 
@@ -161,8 +159,6 @@ int main(int argc, char* argv[])
     if (args.contains(QLatin1String("--pixel-tests")))
         dumper.setDumpPixels(true);
 
-    QString dbDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QDir::separator() + "qtwebkitdrt";
-    QWebSettings::setOfflineStoragePath(dbDir);
     QWebDatabase::removeAllDatabases();
 
     if (args.contains(QLatin1String("-"))) {

-- 
WebKit Debian packaging