Merge Webkit at r71558: Add computeDefaultLanguage

Because navigotor.language no longer hardcoded.

Note that on android HTTP stack, this function will
naivelly return English in order to avoid code dependency
on chrome stack specific code.

http://trac.webkit.org/changeset/71484

Change-Id: I151105bb1478fa2da12ecf50c45102c3afceeb82

diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
index 284e6b3..1b249a4 100644 (file)
--- a/WebKit/android/WebCoreSupport/PlatformBridge.cpp
+++ b/WebKit/android/WebCoreSupport/PlatformBridge.cpp
@@ -157,6 +157,19 @@ FloatRect PlatformBridge::screenRect()
     return FloatRect(0.0, 0.0, info.w, info.h);
 }
 
+String PlatformBridge::computeDefaultLanguage()
+{
+#if USE(CHROME_NETWORK_STACK)
+    std::string acceptLanguages = WebRequestContext::get(false)->GetAcceptLanguage();
+    size_t length = acceptLanguages.find(',');
+    if (length == std::string::npos)
+        length = acceptLanguages.length();
+    return String::fromUTF8(acceptLanguages.c_str(), length);
+#else
+    return "en";
+#endif
+}
+
 void PlatformBridge::updateViewport(FrameView* frameView)
 {
     android::WebViewCore* webViewCore = android::WebViewCore::getWebViewCore(frameView);