Changeset 238406 in webkit

Timestamp:

Nov 20, 2018 2:09:23 PM (5 years ago)

Author:

chris.reid@sony.com

Message:

Remove the need for LocalizedStringsWPE.cpp
​https://bugs.webkit.org/show_bug.cgi?id=191854

Reviewed by Michael Catanzaro.

No change in behavior.

Consolidate "Search the Web" as the default search context menu text on non-COCOA ports.

GTK, WPE, and non-CF WIN all had the same default localizedString function
of String::fromUTF8. Move that to LocalizedString.cpp as the default implementation
for all ports not using CF.

• en.lproj/Localizable.strings:
• platform/LocalizedStrings.cpp:
• platform/gtk/LocalizedStringsGtk.cpp:
• platform/win/LocalizedStringsWin.cpp:
• platform/wpe/LocalizedStringsWPE.cpp: Removed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• SourcesWPE.txt (modified) (1 diff)
• en.lproj/Localizable.strings (modified) (1 diff)
• platform/LocalizedStrings.cpp (modified) (3 diffs)
• platform/gtk/LocalizedStringsGtk.cpp (modified) (2 diffs)
• platform/win/LocalizedStringsWin.cpp (modified) (2 diffs)
• platform/wpe/LocalizedStringsWPE.cpp (deleted)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-20  Christopher Reid  <chris.reid@sony.com>
+
+        Remove the need for LocalizedStringsWPE.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=191854
+
+        Reviewed by Michael Catanzaro.
+
+        No change in behavior.
+
+        Consolidate "Search the Web" as the default search context menu text on non-COCOA ports.
+
+        GTK, WPE, and non-CF WIN all had the same default localizedString function
+        of String::fromUTF8. Move that to LocalizedString.cpp as the default implementation
+        for all ports not using CF.
+
+        * en.lproj/Localizable.strings:
+        * platform/LocalizedStrings.cpp:
+        * platform/gtk/LocalizedStringsGtk.cpp:
+        * platform/win/LocalizedStringsWin.cpp:
+        * platform/wpe/LocalizedStringsWPE.cpp: Removed.
+
 2018-11-20  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/SourcesWPE.txt

@@ -72 +72 @@
 platform/unix/LoggingUnix.cpp
 
-platform/wpe/LocalizedStringsWPE.cpp
 platform/wpe/PlatformScreenWPE.cpp
 platform/wpe/RenderThemeWPE.cpp

trunk/Source/WebCore/en.lproj/Localizable.strings

@@ -599 +599 @@
 "Search with %@" = "Search with %@";
 
-/* Search with Google context menu item */
-"Search with Google" = "Search with Google";
+/* Search the Web context menu item */
+"Search the Web" = "Search the Web";
 
 /* Validation message for required file inputs that have no value */

trunk/Source/WebCore/platform/LocalizedStrings.cpp

@@ -73 +73 @@
 }
 
+#if !USE(CF)
+String localizedString(const char* key)
+{
+    return String::fromUTF8(key, strlen(key));
+}
+#endif
+
 #if ENABLE(CONTEXT_MENUS)
 
@@ -406 +413 @@
     return WEB_UI_STRING_WITH_MNEMONIC("Inspect Element", "Inspect _Element", "Inspect Element context menu item");
 }
+
+#if !PLATFORM(COCOA)
+String contextMenuItemTagSearchWeb()
+{
+    return WEB_UI_STRING_WITH_MNEMONIC("Search the Web", "_Search the Web", "Search the Web context menu item");
+}
+#endif
 
 #endif // ENABLE(CONTEXT_MENUS)
@@ -1084 +1098 @@
 #endif
 
+#if USE(SOUP)
+String unacceptableTLSCertificate()
+{
+    return WEB_UI_STRING("Unacceptable TLS certificate", "Unacceptable TLS certificate error");
+}
+#endif
+
 } // namespace WebCore

trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp

@@ -109 +109 @@
 }
 
-String contextMenuItemTagSearchWeb()
-{
-    return String::fromUTF8(_("_Search the Web"));
-}
-
 String contextMenuItemTagUnicodeInsertLRMMark()
 {
@@ -177 +172 @@
 }
 
-String unacceptableTLSCertificate()
-{
-    return String::fromUTF8(_("Unacceptable TLS certificate"));
-}
-
-String localizedString(const char* key)
-{
-    return String::fromUTF8(key, strlen(key));
-}
-
 } // namespace WebCore

trunk/Source/WebCore/platform/win/LocalizedStringsWin.cpp

@@ -43 +43 @@
 namespace WebCore {
 
+#if USE(CF)
 String localizedString(const char* key)
 {
     ASSERT(isMainThread());
 
-#if USE(CF)
     static CFStringRef notFound = CFSTR("localized string not found");
 
@@ -55 +55 @@
 
     return result.get();
-#else
-    // FIXME: Implement localizedString() for !USE(CF).
-    return String::fromUTF8(key, strlen(key));
-#endif
-}
-
-#if ENABLE(CONTEXT_MENUS)
-String contextMenuItemTagSearchWeb()
-{
-    return WEB_UI_STRING("Search with Google", "Search with Google context menu item");
 }
 #endif