[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 f741599c12685278fdddad1bf74b031b353abc97
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 9 10:40:22 2010 +0000

    2010-02-09  Chang Shu  <Chang.Shu at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] Enable http/tests/appcache but skip the failed cases.
            https://bugs.webkit.org/show_bug.cgi?id=34713
    
            * platform/qt/Skipped:
    2010-02-09  Chang Shu  <Chang.Shu at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] Enable appcache feature.
            https://bugs.webkit.org/show_bug.cgi?id=34713
    
            * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
            (WebCore::WebPage::WebPage):
            * DumpRenderTree/qt/main.cpp:
            (main):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54543 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5ff4a19..69a9a89 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-09  Chang Shu  <Chang.Shu at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Enable http/tests/appcache but skip the failed cases.
+        https://bugs.webkit.org/show_bug.cgi?id=34713
+
+        * platform/qt/Skipped:
+
 2010-02-09  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index e6206ce..bda9192 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -15,7 +15,6 @@ svg/batik/filters/feTile.svg
 # =========================================================================== #
 
 # Disabled HTTP subdirs for now, needs investigation.
-http/tests/appcache
 http/tests/webarchive
 http/tests/globalhistory
 http/tests/incremental
@@ -23,6 +22,18 @@ http/tests/media
 http/tests/webarchive
 http/tests/wml
 
+# Skip failed appcache test cases
+http/tests/appcache/auth.html
+http/tests/appcache/empty-manifest.html
+http/tests/appcache/fallback.html
+http/tests/appcache/foreign-iframe-main.html
+http/tests/appcache/manifest-redirect-2.html
+http/tests/appcache/manifest-with-empty-file.html
+http/tests/appcache/max-size.html
+http/tests/appcache/offline-access.html
+http/tests/appcache/resource-redirect-2.html
+http/tests/appcache/resource-redirect.html
+
 # Failing URL test
 http/tests/uri/escaped-entity.html
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4c56b08..65ee2da 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-09  Chang Shu  <Chang.Shu at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Enable appcache feature.
+        https://bugs.webkit.org/show_bug.cgi?id=34713
+
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::WebPage):
+        * DumpRenderTree/qt/main.cpp:
+        (main):
+
 2010-02-09  Shinichiro Hamaji  <hamaji at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index c16a786..69c5bad 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -135,7 +135,7 @@ 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, 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..71fe921 100644
--- a/WebKitTools/DumpRenderTree/qt/main.cpp
+++ b/WebKitTools/DumpRenderTree/qt/main.cpp
@@ -163,6 +163,7 @@ int main(int argc, char* argv[])
 
     QString dbDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QDir::separator() + "qtwebkitdrt";
     QWebSettings::setOfflineStoragePath(dbDir);
+    QWebSettings::setOfflineWebApplicationCachePath(dbDir);
     QWebDatabase::removeAllDatabases();
 
     if (args.contains(QLatin1String("-"))) {

-- 
WebKit Debian packaging