Title: [126960] trunk/Source/WebKit/efl
Revision
126960
Author
[email protected]
Date
2012-08-28 22:54:51 -0700 (Tue, 28 Aug 2012)

Log Message

[EFL] Add support for localization to the Web Inspector
https://bugs.webkit.org/show_bug.cgi?id=92961

Patch by Seokju Kwon <[email protected]> on 2012-08-28
Reviewed by Gyuyoung Kim.

Implement InspectorFrontendClientEfl::localizedStringsURL()
to return the URL of the localizedStrings.js.

* WebCoreSupport/InspectorClientEfl.cpp:
(WebCore::InspectorClientEfl::openInspectorFrontend):
(WebCore::InspectorClientEfl::inspectorFilesPath):
(WebCore::InspectorFrontendClientEfl::localizedStringsURL):

Modified Paths

Diff

Modified: trunk/Source/WebKit/efl/ChangeLog (126959 => 126960)


--- trunk/Source/WebKit/efl/ChangeLog	2012-08-29 05:11:05 UTC (rev 126959)
+++ trunk/Source/WebKit/efl/ChangeLog	2012-08-29 05:54:51 UTC (rev 126960)
@@ -1,3 +1,18 @@
+2012-08-28  Seokju Kwon  <[email protected]>
+
+        [EFL] Add support for localization to the Web Inspector
+        https://bugs.webkit.org/show_bug.cgi?id=92961
+
+        Reviewed by Gyuyoung Kim.
+
+        Implement InspectorFrontendClientEfl::localizedStringsURL()
+        to return the URL of the localizedStrings.js.
+
+        * WebCoreSupport/InspectorClientEfl.cpp:
+        (WebCore::InspectorClientEfl::openInspectorFrontend):
+        (WebCore::InspectorClientEfl::inspectorFilesPath):
+        (WebCore::InspectorFrontendClientEfl::localizedStringsURL):
+
 2012-08-28  Sheriff Bot  <[email protected]>
 
         Unreviewed, rolling out r126914.

Modified: trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp (126959 => 126960)


--- trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp	2012-08-29 05:11:05 UTC (rev 126959)
+++ trunk/Source/WebKit/efl/WebCoreSupport/InspectorClientEfl.cpp	2012-08-29 05:54:51 UTC (rev 126960)
@@ -93,7 +93,7 @@
 
     m_inspectorView = inspectorView;
 
-    String inspectorUri = inspectorFilesPath();
+    String inspectorUri = inspectorFilesPath() + "/inspector.html";
     ewk_view_uri_set(m_inspectorView, inspectorUri.utf8().data());
 
     OwnPtr<InspectorFrontendClientEfl> frontendClient = adoptPtr(new InspectorFrontendClientEfl(m_inspectedView, m_inspectorView, this));
@@ -140,9 +140,9 @@
 
 String InspectorClientEfl::inspectorFilesPath()
 {
-    String inspectorFilesPath = makeString("file://", WEB_INSPECTOR_INSTALL_DIR, "/inspector.html");
-    if (access(inspectorFilesPath.utf8().data(), R_OK)) // On success, zero is returned
-        inspectorFilesPath = makeString("file://", WEB_INSPECTOR_DIR, "/inspector.html");
+    String inspectorFilesPath = "file://" + String(WEB_INSPECTOR_INSTALL_DIR);
+    if (access(inspectorFilesPath.utf8().data(), R_OK))
+        inspectorFilesPath = "file://" + String(WEB_INSPECTOR_DIR);
 
     return inspectorFilesPath;
 }
@@ -168,8 +168,7 @@
 
 String InspectorFrontendClientEfl::localizedStringsURL()
 {
-    notImplemented();
-    return String();
+    return m_inspectorClient->inspectorFilesPath() + "/localizedStrings.js";
 }
 
 String InspectorFrontendClientEfl::hiddenPanels()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to