Title: [133024] trunk/Tools
- Revision
- 133024
- Author
- [email protected]
- Date
- 2012-10-31 07:01:43 -0700 (Wed, 31 Oct 2012)
Log Message
[WTR] WebKitTestRunner is not cleaning up the icon database
https://bugs.webkit.org/show_bug.cgi?id=100678
Patch by Thiago Marcos P. Santos <[email protected]> on 2012-10-31
Reviewed by Kenneth Rohde Christiansen.
The icon database was not being set to the temporary folder created for
the test runner by the test driver, which is removed automatically
after the run.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (133023 => 133024)
--- trunk/Tools/ChangeLog 2012-10-31 13:59:58 UTC (rev 133023)
+++ trunk/Tools/ChangeLog 2012-10-31 14:01:43 UTC (rev 133024)
@@ -1,3 +1,17 @@
+2012-10-31 Thiago Marcos P. Santos <[email protected]>
+
+ [WTR] WebKitTestRunner is not cleaning up the icon database
+ https://bugs.webkit.org/show_bug.cgi?id=100678
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ The icon database was not being set to the temporary folder created for
+ the test runner by the test driver, which is removed automatically
+ after the run.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+
2012-10-31 Mike West <[email protected]>
Script run from an isolated world should bypass a page's CSP.
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (133023 => 133024)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2012-10-31 13:59:58 UTC (rev 133023)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2012-10-31 14:01:43 UTC (rev 133024)
@@ -323,6 +323,18 @@
WKContextSetLocalStorageDirectory(m_context.get(), dumpRenderTreeTempWK.get());
WKContextSetDiskCacheDirectory(m_context.get(), dumpRenderTreeTempWK.get());
WKContextSetCookieStorageDirectory(m_context.get(), dumpRenderTreeTempWK.get());
+
+ std::string iconDatabaseFileTemp(dumpRenderTreeTemp);
+ // WebCore::pathByAppendingComponent is not used here because of the namespace,
+ // which leads us to this ugly #ifdef and file path concatenation.
+#if OS(WINDOWS)
+ const char separator = '\\';
+#else
+ const char separator = '/';
+#endif
+ iconDatabaseFileTemp = iconDatabaseFileTemp + separator + "WebpageIcons.db";
+ WKRetainPtr<WKStringRef> iconDatabaseFileTempWK = WKStringCreateWithUTF8CString(iconDatabaseFileTemp.c_str());
+ WKContextSetIconDatabasePath(m_context.get(), iconDatabaseFileTempWK.get());
}
platformInitializeContext();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
