Changeset 71484 in webkit

Timestamp:

Nov 7, 2010 3:38:22 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-11-07 John Reck <​jreck@google.com>

Reviewed by Steve Block.

Implements navigator.language for Android
​https://bugs.webkit.org/show_bug.cgi?id=49099

Android was previously hardcoding the value for WebCore::platformDefaultLanguage().
This patch removes the hardcoding and calls into the PlatformBridge to get the
correct language based off of the user's settings.

No new tests needed, this is already covered

• Android.mk:
• platform/android/LanguageAndroid.cpp: Added. (WebCore::platformDefaultLanguage):
• platform/android/PlatformBridge.h:
• platform/android/TemporaryLinkStubs.cpp:

Location:

trunk/WebCore

Files:

• Android.mk (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• platform/android/LanguageAndroid.cpp (added)
• platform/android/PlatformBridge.h (modified) (1 diff)
• platform/android/TemporaryLinkStubs.cpp (modified) (1 diff)

trunk/WebCore/Android.mk

@@ -484 +484 @@
         platform/android/GeolocationServiceBridge.cpp \
         platform/android/KeyEventAndroid.cpp \
+        platform/android/LanguageAndroid.cpp \
         platform/android/LocalizedStringsAndroid.cpp \
         platform/android/PlatformTouchEventAndroid.cpp \

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-11-07  John Reck  <jreck@google.com>
+
+        Reviewed by Steve Block.
+
+        Implements navigator.language for Android
+        https://bugs.webkit.org/show_bug.cgi?id=49099
+        
+        Android was previously hardcoding the value for WebCore::platformDefaultLanguage().
+        This patch removes the hardcoding and calls into the PlatformBridge to get the
+        correct language based off of the user's settings.
+
+        No new tests needed, this is already covered
+
+        * Android.mk:
+        * platform/android/LanguageAndroid.cpp: Added.
+        (WebCore::platformDefaultLanguage):
+        * platform/android/PlatformBridge.h:
+        * platform/android/TemporaryLinkStubs.cpp:
+
 2010-11-07  Robert Hogan  <robert@webkit.org>
 

trunk/WebCore/platform/android/PlatformBridge.h

@@ -105 +105 @@
     // Plugin
     static NPObject* pluginScriptableObject(Widget*);
+    // Language
+    static String computeDefaultLanguage();
 };
 

trunk/WebCore/platform/android/TemporaryLinkStubs.cpp

@@ -94 +94 @@
 /********************************************************/
 
-// This function is used by Javascript to find out what the default language
-// the user has selected. It is used by the JS object Navigator.language
-// I guess this information should be mapped with the Accept-Language: HTTP header.
-String WebCore::defaultLanguage()
-{
-    verifiedOk();
-    return "en";
-}
-
 namespace WebCore {