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

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f045e39c1e4bd3d6c68d299dfd59243ad4352611
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 00:14:41 2010 +0000

    [Qt] Unreviewed. Roll-out r54543, because layout tests crash in debug mode.
    https://bugs.webkit.org/show_bug.cgi?id=34713
    
    WebKitTools:
    
    * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
    (WebCore::WebPage::WebPage):
    * DumpRenderTree/qt/main.cpp:
    (main):
    
    LayoutTests:
    
    * platform/qt/Skipped:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54573 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 903a5a5..00daa00 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,12 @@
 2010-02-09  Csaba Osztrogonác  <ossy at webkit.org>
 
+        [Qt] Unreviewed. Roll-out r54543, because layout tests crash in debug mode.
+        https://bugs.webkit.org/show_bug.cgi?id=34713
+
+        * platform/qt/Skipped:
+
+2010-02-09  Csaba Osztrogonác  <ossy at webkit.org>
+
         [Qt] Unreviewed trivial fix.
 
         platform/mac/svg/custom/use-on-symbol-inside-pattern-expected.txt updated 
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index b343faf..a7b6853 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -15,6 +15,7 @@ svg/batik/filters/feTile.svg
 # =========================================================================== #
 
 # Disabled HTTP subdirs for now, needs investigation.
+http/tests/appcache
 http/tests/webarchive
 http/tests/globalhistory
 http/tests/incremental
@@ -22,18 +23,6 @@ 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 bc68c38..cdae8d5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-09  Csaba Osztrogonác  <ossy at webkit.org>
+
+        [Qt] Unreviewed. Roll-out r54543, because layout tests crash in debug mode.
+        https://bugs.webkit.org/show_bug.cgi?id=34713
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::WebPage::WebPage):
+        * DumpRenderTree/qt/main.cpp:
+        (main):
+
 2010-02-09  Alejandro G. Castro  <alex at igalia.com>
 
         Unreviewed; added myself to committers
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 69c5bad..c16a786 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, true);
+    globalSettings->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, false);
 
     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 71fe921..efcda57 100644
--- a/WebKitTools/DumpRenderTree/qt/main.cpp
+++ b/WebKitTools/DumpRenderTree/qt/main.cpp
@@ -163,7 +163,6 @@ 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