Changeset 123200 in webkit

Timestamp:

Jul 20, 2012 3:28:43 AM (12 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Unreviewed, rolling out r123085.
​http://trac.webkit.org/changeset/123085
​https://bugs.webkit.org/show_bug.cgi?id=91719

r123085 causes crashes on EFL layout test bot.

Source/WebKit2:

• UIProcess/efl/WebContextEfl.cpp:

(WebKit::WebContext::applicationCacheDirectory):

Tools:

• WebKitTestRunner/CMakeLists.txt:
• WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp:

(WTR::LayoutTestController::platformInitialize):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/CMakeLists.txt (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-20  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Unreviewed, rolling out r123085.
+        http://trac.webkit.org/changeset/123085
+        https://bugs.webkit.org/show_bug.cgi?id=91719
+
+        r123085 causes crashes on EFL layout test bot.
+
+        * UIProcess/efl/WebContextEfl.cpp:
+        (WebKit::WebContext::applicationCacheDirectory):
+
 2012-07-20  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp

@@ -28 +28 @@
 
 #include <WebCore/ApplicationCacheStorage.h>
-#include <WebCore/FileSystem.h>
 #include <WebCore/NotImplemented.h>
 
@@ -35 +34 @@
 String WebContext::applicationCacheDirectory()
 {
-    String cacheDir = WebCore::cacheStorage().cacheDirectory();
-    
-    // The WebKitTestRunner sets the cacheDirectory and
-    // we should not overwrite it.
-    if (cacheDir.isEmpty()) 
-        cacheDir = makeString(WebCore::homeDirectoryPath(), "/.webkit/Applications");
-
-    return cacheDir;
+    return WebCore::cacheStorage().cacheDirectory();
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-20  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Unreviewed, rolling out r123085.
+        http://trac.webkit.org/changeset/123085
+        https://bugs.webkit.org/show_bug.cgi?id=91719
+
+        r123085 causes crashes on EFL layout test bot.
+
+        * WebKitTestRunner/CMakeLists.txt:
+        * WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp:
+        (WTR::LayoutTestController::platformInitialize):
+
 2012-07-20  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/Tools/WebKitTestRunner/CMakeLists.txt

@@ -25 +25 @@
     ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
     ${WEBCORE_DIR}/editing
-    ${WEBCORE_DIR}/page
     ${WEBCORE_DIR}/platform
     ${WEBCORE_DIR}/platform/graphics
     ${WEBCORE_DIR}/platform/network
-    ${WEBCORE_DIR}/platform/sql
     ${WEBCORE_DIR}/platform/text
     ${WEBCORE_DIR}/testing/js

trunk/Tools/WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp

@@ -23 +23 @@
 #include "InjectedBundle.h"
 #include <Ecore.h>
-#include <WebCore/ApplicationCacheStorage.h>
 
 namespace WTR {
@@ -35 +34 @@
 void LayoutTestController::platformInitialize()
 {
-    // The testrunner script is may be running multiple processes in parallel,
-    // and it makes appcache tests fail if they are using the same directory.
-    // DUMPRENDERTREE_TEMP points to a different directory for each process.
-    String appCacheDirectory = makeString(String::fromUTF8(getenv("DUMPRENDERTREE_TEMP")), "/Applications");
-    WebCore::cacheStorage().setCacheDirectory(appCacheDirectory);
     m_waitToDumpWatchdogTimer = 0;
 }