Title: [96848] trunk/Tools
- Revision
- 96848
- Author
- [email protected]
- Date
- 2011-10-06 12:28:52 -0700 (Thu, 06 Oct 2011)
Log Message
[EFL] DRT: Create icon database path in LayoutTestController::setIconDatabaseEnabled.
https://bugs.webkit.org/show_bug.cgi?id=69450
Patch by Raphael Kubo da Costa <[email protected]> on 2011-10-06
Reviewed by Ryosuke Niwa.
This should avoid stderr messages when running
webarchive/test-link-rel-icon.html.
* DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
(LayoutTestController::setIconDatabaseEnabled):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (96847 => 96848)
--- trunk/Tools/ChangeLog 2011-10-06 19:27:36 UTC (rev 96847)
+++ trunk/Tools/ChangeLog 2011-10-06 19:28:52 UTC (rev 96848)
@@ -1,3 +1,16 @@
+2011-10-06 Raphael Kubo da Costa <[email protected]>
+
+ [EFL] DRT: Create icon database path in LayoutTestController::setIconDatabaseEnabled.
+ https://bugs.webkit.org/show_bug.cgi?id=69450
+
+ Reviewed by Ryosuke Niwa.
+
+ This should avoid stderr messages when running
+ webarchive/test-link-rel-icon.html.
+
+ * DumpRenderTree/efl/LayoutTestControllerEfl.cpp:
+ (LayoutTestController::setIconDatabaseEnabled):
+
2011-10-06 Alejandro G. Castro <[email protected]>
[WK2] [GTK] Add Skipped file for Webkit2 test runner
Modified: trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp (96847 => 96848)
--- trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2011-10-06 19:27:36 UTC (rev 96847)
+++ trunk/Tools/DumpRenderTree/efl/LayoutTestControllerEfl.cpp 2011-10-06 19:28:52 UTC (rev 96848)
@@ -44,6 +44,7 @@
#include "WorkQueueItem.h"
#include "ewk_private.h"
#include <EWebKit.h>
+#include <Ecore_File.h>
#include <_javascript_Core/JSRetainPtr.h>
#include <_javascript_Core/JSStringRef.h>
#include <_javascript_Core/OpaqueJSString.h>
@@ -399,17 +400,19 @@
}
String databasePath;
+ const char* tempDir = getenv("TMPDIR");
- if (getenv("TMPDIR"))
- databasePath = String::fromUTF8(getenv("TMPDIR"));
- else if (getenv("TEMP"))
- databasePath = String::fromUTF8(getenv("TEMP"));
+ if (tempDir)
+ databasePath = String::fromUTF8(tempDir);
+ else if (tempDir = getenv("TEMP"))
+ databasePath = String::fromUTF8(tempDir);
else
databasePath = String::fromUTF8("/tmp");
databasePath.append("/DumpRenderTree/IconDatabase");
- ewk_settings_icon_database_path_set(databasePath.utf8().data());
+ if (ecore_file_mkpath(databasePath.utf8().data()))
+ ewk_settings_icon_database_path_set(databasePath.utf8().data());
}
void LayoutTestController::setJavaScriptProfilingEnabled(bool)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
