Changeset 123085 in webkit
- Timestamp:
- Jul 19, 2012 2:59:39 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r123019 r123085 1 2012-07-19 Zoltan Nyul <zoltan.nyul@intel.com> 2 3 [EFL][WK2] Using different cache directory for each WTR process 4 https://bugs.webkit.org/show_bug.cgi?id=91719 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 Make sure we return a valid application cache directory in 9 WebContextEfl. 10 11 * UIProcess/efl/WebContextEfl.cpp: 12 (WebKit::WebContext::applicationCacheDirectory): 13 1 14 2012-07-18 Christophe Dumez <christophe.dumez@intel.com> 2 15 -
trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp
r96969 r123085 28 28 29 29 #include <WebCore/ApplicationCacheStorage.h> 30 #include <WebCore/FileSystem.h> 30 31 #include <WebCore/NotImplemented.h> 31 32 … … 34 35 String WebContext::applicationCacheDirectory() 35 36 { 36 return WebCore::cacheStorage().cacheDirectory(); 37 String cacheDir = WebCore::cacheStorage().cacheDirectory(); 38 39 // The WebKitTestRunner sets the cacheDirectory and 40 // we should not overwrite it. 41 if (cacheDir.isEmpty()) 42 cacheDir = makeString(WebCore::homeDirectoryPath(), "/.webkit/Applications"); 43 44 return cacheDir; 37 45 } 38 46 -
trunk/Tools/ChangeLog
r123083 r123085 1 2012-07-19 Zoltan Nyul <zoltan.nyul@intel.com> 2 3 [EFL][WK2] Using different cache directory for each WTR process 4 https://bugs.webkit.org/show_bug.cgi?id=91719 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 The testrunner script may be running multiple processes in 9 parallel, and it makes appcache tests fail if they are using the same 10 directory. I modified the EFL's LayoutTestController to use the 11 DUMPRENDERTREE_TEMP for application cache directory because it's 12 different for each process. 13 14 * WebKitTestRunner/CMakeLists.txt: 15 * WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp: 16 (WTR::LayoutTestController::platformInitialize): 17 1 18 2012-07-19 Mario Sanchez Prada <msanchez@igalia.com> 2 19 -
trunk/Tools/WebKitTestRunner/CMakeLists.txt
r121893 r123085 25 25 ${JAVASCRIPTCORE_DIR}/ForwardingHeaders 26 26 ${WEBCORE_DIR}/editing 27 ${WEBCORE_DIR}/page 27 28 ${WEBCORE_DIR}/platform 28 29 ${WEBCORE_DIR}/platform/graphics 29 30 ${WEBCORE_DIR}/platform/network 31 ${WEBCORE_DIR}/platform/sql 30 32 ${WEBCORE_DIR}/platform/text 31 33 ${WEBCORE_DIR}/testing/js -
trunk/Tools/WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp
r121893 r123085 23 23 #include "InjectedBundle.h" 24 24 #include <Ecore.h> 25 #include <WebCore/ApplicationCacheStorage.h> 25 26 26 27 namespace WTR { … … 34 35 void LayoutTestController::platformInitialize() 35 36 { 37 // The testrunner script is may be running multiple processes in parallel, 38 // and it makes appcache tests fail if they are using the same directory. 39 // DUMPRENDERTREE_TEMP points to a different directory for each process. 40 String appCacheDirectory = makeString(String::fromUTF8(getenv("DUMPRENDERTREE_TEMP")), "/Applications"); 41 WebCore::cacheStorage().setCacheDirectory(appCacheDirectory); 36 42 m_waitToDumpWatchdogTimer = 0; 37 43 }
Note: See TracChangeset
for help on using the changeset viewer.