diff options
Diffstat (limited to 'Tools/WebKitTestRunner/TestController.cpp')
| -rw-r--r-- | Tools/WebKitTestRunner/TestController.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp index 2eb635b21..145c27087 100644 --- a/Tools/WebKitTestRunner/TestController.cpp +++ b/Tools/WebKitTestRunner/TestController.cpp @@ -331,7 +331,6 @@ void TestController::initialize(int argc, const char* argv[]) 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) @@ -339,9 +338,8 @@ void TestController::initialize(int argc, const char* argv[]) #else const char separator = '/'; #endif - iconDatabaseFileTemp = iconDatabaseFileTemp + separator + "WebpageIcons.db"; - WKRetainPtr<WKStringRef> iconDatabaseFileTempWK = WKStringCreateWithUTF8CString(iconDatabaseFileTemp.c_str()); - WKContextSetIconDatabasePath(m_context.get(), iconDatabaseFileTempWK.get()); + String iconDatabaseFileTemp = String::fromUTF8(dumpRenderTreeTemp) + separator + String(ASCIILiteral("WebpageIcons.db")); + WKContextSetIconDatabasePath(m_context.get(), toWK(iconDatabaseFileTemp).get()); } platformInitializeContext(); |
