Diff
Modified: trunk/LayoutTests/ChangeLog (96968 => 96969)
--- trunk/LayoutTests/ChangeLog 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/LayoutTests/ChangeLog 2011-10-07 19:25:00 UTC (rev 96969)
@@ -1,3 +1,14 @@
+2011-10-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r96938.
+ http://trac.webkit.org/changeset/96938
+ https://bugs.webkit.org/show_bug.cgi?id=69653
+
+ It broke zillion tests and make testing so slow (Requested by
+ ossy_ on #webkit).
+
+ * platform/qt-wk2/Skipped:
+
2011-10-07 Csaba Osztrogonác <[email protected]>
Unreviewed gardening after r96958.
Modified: trunk/LayoutTests/platform/qt-wk2/Skipped (96968 => 96969)
--- trunk/LayoutTests/platform/qt-wk2/Skipped 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/LayoutTests/platform/qt-wk2/Skipped 2011-10-07 19:25:00 UTC (rev 96969)
@@ -331,6 +331,7 @@
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 (96968 => 96969)
--- trunk/Source/WebKit2/ChangeLog 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-07 19:25:00 UTC (rev 96969)
@@ -1,3 +1,25 @@
+2011-10-07 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r96938.
+ http://trac.webkit.org/changeset/96938
+ https://bugs.webkit.org/show_bug.cgi?id=69653
+
+ It broke zillion tests and make testing so slow (Requested by
+ ossy_ on #webkit).
+
+ * UIProcess/WebContext.cpp:
+ * UIProcess/WebContext.h:
+ * UIProcess/efl/WebContextEfl.cpp:
+ (WebKit::WebContext::applicationCacheDirectory):
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::applicationCacheDirectory):
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::applicationCacheDirectory):
+ * UIProcess/qt/WebContextQt.cpp:
+ (WebKit::WebContext::applicationCacheDirectory):
+ * UIProcess/win/WebContextWin.cpp:
+ (WebKit::WebContext::applicationCacheDirectory):
+
2011-10-07 Qi Zhang <[email protected]>
[Qt][WK2] ApplicationCache LayoutTests failed
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (96968 => 96969)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2011-10-07 19:25:00 UTC (rev 96969)
@@ -802,14 +802,6 @@
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 (96968 => 96969)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2011-10-07 19:25:00 UTC (rev 96969)
@@ -110,9 +110,7 @@
void setAdditionalPluginsDirectory(const String&);
PluginInfoStore& pluginInfoStore() { return m_pluginInfoStore; }
- String applicationCacheDirectory() const;
- String platformDefaultApplicationCacheDirectory() const;
- void setApplicationCacheDirectory(const String& dir) { m_overrideApplicationCacheDirectory = dir; }
+ String applicationCacheDirectory();
void setAlwaysUsesComplexTextCodePath(bool);
void setShouldUseFontSmoothing(bool);
@@ -281,7 +279,6 @@
String m_overrideDatabaseDirectory;
String m_overrideIconDatabasePath;
String m_overrideLocalStorageDirectory;
- String m_overrideApplicationCacheDirectory;
bool m_processTerminationEnabled;
Modified: trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (96968 => 96969)
--- trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp 2011-10-07 19:25:00 UTC (rev 96969)
@@ -31,7 +31,7 @@
namespace WebKit {
-String WebContext::platformDefaultApplicationCacheDirectory() const
+String WebContext::applicationCacheDirectory()
{
return WebCore::cacheStorage().cacheDirectory();
}
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (96968 => 96969)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2011-10-07 19:25:00 UTC (rev 96969)
@@ -31,7 +31,7 @@
namespace WebKit {
-WTF::String WebContext::platformDefaultApplicationCacheDirectory() const
+WTF::String WebContext::applicationCacheDirectory()
{
return WebCore::cacheStorage().cacheDirectory();
}
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (96968 => 96969)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2011-10-07 19:25:00 UTC (rev 96969)
@@ -44,7 +44,7 @@
namespace WebKit {
-String WebContext::platformDefaultApplicationCacheDirectory() const
+String WebContext::applicationCacheDirectory()
{
NSString *appName = [[NSBundle mainBundle] bundleIdentifier];
if (!appName)
Modified: trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp (96968 => 96969)
--- trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/Source/WebKit2/UIProcess/qt/WebContextQt.cpp 2011-10-07 19:25:00 UTC (rev 96969)
@@ -55,9 +55,9 @@
static QString s_defaultDatabaseDirectory;
static QString s_defaultLocalStorageDirectory;
-String WebContext::platformDefaultApplicationCacheDirectory() const
+String WebContext::applicationCacheDirectory()
{
- return defaultDataLocation();
+ return WebCore::cacheStorage().cacheDirectory();
}
void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
Modified: trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp (96968 => 96969)
--- trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp 2011-10-07 19:23:24 UTC (rev 96968)
+++ trunk/Source/WebKit2/UIProcess/win/WebContextWin.cpp 2011-10-07 19:25:00 UTC (rev 96969)
@@ -39,7 +39,7 @@
namespace WebKit {
-String WebContext::platformDefaultApplicationCacheDirectory() const
+String WebContext::applicationCacheDirectory()
{
return localUserSpecificStorageDirectory();
}
