- Revision
- 96938
- Author
- [email protected]
- Date
- 2011-10-07 08:09:13 -0700 (Fri, 07 Oct 2011)
Log Message
[Qt][WK2] ApplicationCache LayoutTests failed
https://bugs.webkit.org/show_bug.cgi?id=69541
Reviewed by Chang Shu.
Source/WebKit2:
1. Moved applicationCacheDirectory to common code.
2. Added interface setApplicationCacheDirectory to allow UI client overriding.
3. Renamed all platform-dependent implementations of applicationCacheDirectory to platformDefaultApplicationCacheDirectory.
4. On Qt, set the platformDefaultApplicationCacheDirectory to the default data location.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::applicationCacheDirectory):
* UIProcess/WebContext.h:
(WebKit::WebContext::setApplicationCacheDirectory):
* UIProcess/efl/WebContextEfl.cpp:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
* UIProcess/win/WebContextWin.cpp:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
LayoutTests:
Unskip passed tests.
* platform/qt-wk2/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (96937 => 96938)
--- trunk/LayoutTests/ChangeLog 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/LayoutTests/ChangeLog 2011-10-07 15:09:13 UTC (rev 96938)
@@ -1,3 +1,14 @@
+2011-10-07 Qi Zhang <[email protected]>
+
+ [Qt][WK2] ApplicationCache LayoutTests failed
+ https://bugs.webkit.org/show_bug.cgi?id=69541
+
+ Reviewed by Chang Shu.
+
+ Unskip passed tests.
+
+ * platform/qt-wk2/Skipped:
+
2011-10-07 Philippe Normand <[email protected]>
Unreviewed, skip failing svg test in GTK.
Modified: trunk/LayoutTests/platform/qt-wk2/Skipped (96937 => 96938)
--- trunk/LayoutTests/platform/qt-wk2/Skipped 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/LayoutTests/platform/qt-wk2/Skipped 2011-10-07 15:09:13 UTC (rev 96938)
@@ -331,7 +331,6 @@
storage/read-transactions-running-concurrently.html
# FAIL: Timed out waiting for notifyDone to be called
-http/tests/appcache
fast/dom/beforeload/video-before-load.html
media/video-source-moved.html
http/tests/websocket/tests/hixie76/frame-lengths.html
Modified: trunk/Source/WebKit2/ChangeLog (96937 => 96938)
--- trunk/Source/WebKit2/ChangeLog 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-07 15:09:13 UTC (rev 96938)
@@ -1,3 +1,31 @@
+2011-10-07 Qi Zhang <[email protected]>
+
+ [Qt][WK2] ApplicationCache LayoutTests failed
+ https://bugs.webkit.org/show_bug.cgi?id=69541
+
+ Reviewed by Chang Shu.
+
+ 1. Moved applicationCacheDirectory to common code.
+ 2. Added interface setApplicationCacheDirectory to allow UI client overriding.
+ 3. Renamed all platform-dependent implementations of applicationCacheDirectory to platformDefaultApplicationCacheDirectory.
+ 4. On Qt, set the platformDefaultApplicationCacheDirectory to the default data location.
+
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::applicationCacheDirectory):
+ * UIProcess/WebContext.h:
+ (WebKit::WebContext::setApplicationCacheDirectory):
+ * UIProcess/efl/WebContextEfl.cpp:
+ (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+ * UIProcess/qt/WebContextQt.cpp:
+ (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+ * UIProcess/win/WebContextWin.cpp:
+ (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+
2011-10-06 Brent Fulgham <[email protected]>
[WinCairo] Correct improper identification of WKQC extensions.
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (96937 => 96938)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-10-07 15:09:13 UTC (rev 96938)
@@ -802,6 +802,14 @@
return platformDefaultLocalStorageDirectory();
}
+String WebContext::applicationCacheDirectory() const
+{
+ if (!m_overrideApplicationCacheDirectory.isEmpty())
+ return m_overrideApplicationCacheDirectory;
+
+ return platformDefaultApplicationCacheDirectory();
+}
+
void WebContext::setHTTPPipeliningEnabled(bool enabled)
{
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (96937 => 96938)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2011-10-07 15:09:13 UTC (rev 96938)
@@ -110,7 +110,9 @@
void setAdditionalPluginsDirectory(const String&);
PluginInfoStore& pluginInfoStore() { return m_pluginInfoStore; }
- String applicationCacheDirectory();
+ String applicationCacheDirectory() const;
+ String platformDefaultApplicationCacheDirectory() const;
+ void setApplicationCacheDirectory(const String& dir) { m_overrideApplicationCacheDirectory = dir; }
void setAlwaysUsesComplexTextCodePath(bool);
void setShouldUseFontSmoothing(bool);
@@ -279,6 +281,7 @@
String m_overrideDatabaseDirectory;
String m_overrideIconDatabasePath;
String m_overrideLocalStorageDirectory;
+ String m_overrideApplicationCacheDirectory;
bool m_processTerminationEnabled;
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (96937 => 96938)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2011-10-07 15:09:13 UTC (rev 96938)
@@ -31,7 +31,7 @@
namespace WebKit {
-String WebContext::applicationCacheDirectory()
+String WebContext::platformDefaultApplicationCacheDirectory() const
{
return WebCore::cacheStorage().cacheDirectory();
}
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (96937 => 96938)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2011-10-07 15:09:13 UTC (rev 96938)
@@ -31,7 +31,7 @@
namespace WebKit {
-WTF::String WebContext::applicationCacheDirectory()
+WTF::String WebContext::platformDefaultApplicationCacheDirectory() const
{
return WebCore::cacheStorage().cacheDirectory();
}
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (96937 => 96938)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2011-10-07 15:09:13 UTC (rev 96938)
@@ -44,7 +44,7 @@
namespace WebKit {
-String WebContext::applicationCacheDirectory()
+String WebContext::platformDefaultApplicationCacheDirectory() const
{
NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
if (!appName)
Modified: trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp (96937 => 96938)
--- trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp 2011-10-07 15:09:13 UTC (rev 96938)
@@ -55,9 +55,9 @@
static QString s_defaultDatabaseDirectory;
static QString s_defaultLocalStorageDirectory;
-String WebContext::applicationCacheDirectory()
+String WebContext::platformDefaultApplicationCacheDirectory() const
{
- return WebCore::cacheStorage().cacheDirectory();
+ return defaultDataLocation();
}
void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
Modified: trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp (96937 => 96938)
--- trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp 2011-10-07 14:56:12 UTC (rev 96937)
+++ trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp 2011-10-07 15:09:13 UTC (rev 96938)
@@ -39,7 +39,7 @@
namespace WebKit {
-String WebContext::applicationCacheDirectory()
+String WebContext::platformDefaultApplicationCacheDirectory() const
{
return localUserSpecificStorageDirectory();
}
