Title: [144982] trunk/Source/WebKit2
- Revision
- 144982
- Author
- [email protected]
- Date
- 2013-03-06 14:26:51 -0800 (Wed, 06 Mar 2013)
Log Message
[GTK][WK2] Implement WebInspector::localizedStringsURL() to return the file URL of localizedStrings.js
https://bugs.webkit.org/show_bug.cgi?id=111448
Patch by Sudarsana Nagineni <[email protected]> on 2013-03-06
Reviewed by Alexey Proskuryakov.
Implement WebInspector::localizedStringsURL() method to return the
file URL of the localizedStrings.js.
This prevents printing warnings about "Localized string not found" in
the console.
* WebProcess/WebPage/gtk/WebInspectorGtk.cpp:
(WebKit::WebInspector::localizedStringsURL):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (144981 => 144982)
--- trunk/Source/WebKit2/ChangeLog 2013-03-06 22:24:31 UTC (rev 144981)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-06 22:26:51 UTC (rev 144982)
@@ -1,5 +1,21 @@
2013-03-06 Sudarsana Nagineni <[email protected]>
+ [GTK][WK2] Implement WebInspector::localizedStringsURL() to return the file URL of localizedStrings.js
+ https://bugs.webkit.org/show_bug.cgi?id=111448
+
+ Reviewed by Alexey Proskuryakov.
+
+ Implement WebInspector::localizedStringsURL() method to return the
+ file URL of the localizedStrings.js.
+
+ This prevents printing warnings about "Localized string not found" in
+ the console.
+
+ * WebProcess/WebPage/gtk/WebInspectorGtk.cpp:
+ (WebKit::WebInspector::localizedStringsURL):
+
+2013-03-06 Sudarsana Nagineni <[email protected]>
+
[EFL][WK2] REGRESSION(r143582): API test EWK2UnitTestBase.ewk_view_contents_size_changed failing
https://bugs.webkit.org/show_bug.cgi?id=110608
Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp (144981 => 144982)
--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp 2013-03-06 22:24:31 UTC (rev 144981)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp 2013-03-06 22:26:51 UTC (rev 144982)
@@ -29,15 +29,24 @@
#if ENABLE(INSPECTOR)
-#include <WebCore/NotImplemented.h>
+#include <WebCore/FileSystem.h>
+#include <glib.h>
+#include <wtf/gobject/GOwnPtr.h>
#include <wtf/text/WTFString.h>
namespace WebKit {
String WebInspector::localizedStringsURL() const
{
- notImplemented();
- return String();
+ GOwnPtr<gchar> filePath;
+ const gchar* environmentPath = g_getenv("WEBKIT_INSPECTOR_PATH");
+ if (environmentPath && g_file_test(environmentPath, G_FILE_TEST_IS_DIR))
+ filePath.set(g_build_filename(environmentPath, "localizedStrings.js", NULL));
+ else
+ filePath.set(g_build_filename(WebCore::sharedResourcesPath().data(), "webinspector", "localizedStrings.js", NULL));
+
+ GOwnPtr<gchar> fileURI(g_filename_to_uri(filePath.get(), 0, 0));
+ return WebCore::filenameToString(fileURI.get());
}
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
