Title: [127091] trunk
Revision
127091
Author
[email protected]
Date
2012-08-29 20:30:51 -0700 (Wed, 29 Aug 2012)

Log Message

[Qt][WK2] ApplicationCache LayoutTests failed
https://bugs.webkit.org/show_bug.cgi?id=69541

Patch by Luciano Wolf <[email protected]> on 2012-08-29
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

Returns defaultDiskCacheDirectory when no cache directory was provided.
It's used by setOfflineWebApplicationCacheEnabled method that won't work
with an invalid cache directory.

* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::applicationCacheDirectory):

LayoutTests:

Unskip http/appcache tests for qt-5.0-wk2.

* platform/qt-5.0-wk2/Skipped:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (127090 => 127091)


--- trunk/LayoutTests/ChangeLog	2012-08-30 03:23:35 UTC (rev 127090)
+++ trunk/LayoutTests/ChangeLog	2012-08-30 03:30:51 UTC (rev 127091)
@@ -1,3 +1,14 @@
+2012-08-29  Luciano Wolf  <[email protected]>
+
+        [Qt][WK2] ApplicationCache LayoutTests failed
+        https://bugs.webkit.org/show_bug.cgi?id=69541
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Unskip http/appcache tests for qt-5.0-wk2.
+
+        * platform/qt-5.0-wk2/Skipped:
+
 2012-08-29  Yoshifumi Inoue  <[email protected]>
 
         [Tests] Add test case for right-to-left rendering of multiple fields time input UI

Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (127090 => 127091)


--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped	2012-08-30 03:23:35 UTC (rev 127090)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped	2012-08-30 03:30:51 UTC (rev 127091)
@@ -148,7 +148,6 @@
 fast/overflow/scrollbar-restored-and-then-locked.html
 
 # FAIL: Timed out waiting for notifyDone to be called
-http/tests/appcache
 media/video-source-moved.html
 
 # These tests always fail (with and without --singly). It needs investigation.

Modified: trunk/Source/WebKit2/ChangeLog (127090 => 127091)


--- trunk/Source/WebKit2/ChangeLog	2012-08-30 03:23:35 UTC (rev 127090)
+++ trunk/Source/WebKit2/ChangeLog	2012-08-30 03:30:51 UTC (rev 127091)
@@ -1,3 +1,17 @@
+2012-08-29  Luciano Wolf  <[email protected]>
+
+        [Qt][WK2] ApplicationCache LayoutTests failed
+        https://bugs.webkit.org/show_bug.cgi?id=69541
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Returns defaultDiskCacheDirectory when no cache directory was provided.
+        It's used by setOfflineWebApplicationCacheEnabled method that won't work
+        with an invalid cache directory.
+
+        * UIProcess/qt/WebContextQt.cpp:
+        (WebKit::WebContext::applicationCacheDirectory):
+
 2012-08-29  José Dapena Paz  <[email protected]>
 
         [Gtk] Process Gtk 3.4 smooth scroll events properly.

Modified: trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp (127090 => 127091)


--- trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp	2012-08-30 03:23:35 UTC (rev 127090)
+++ trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp	2012-08-30 03:30:51 UTC (rev 127091)
@@ -58,7 +58,12 @@
 
 String WebContext::applicationCacheDirectory()
 {
-    return WebCore::cacheStorage().cacheDirectory();
+    const String cacheDirectory = WebCore::cacheStorage().cacheDirectory();
+
+    if (cacheDirectory.isEmpty())
+        return defaultDiskCacheDirectory();
+
+    return cacheDirectory;
 }
 
 void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to