From e8e7e7f47930d953f99108f9a82214f2f2a5a7bc Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Fri, 12 Nov 2010 10:27:14 -0800 Subject: [PATCH] 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 --- WebKit/android/WebCoreSupport/PlatformBridge.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/WebKit/android/WebCoreSupport/PlatformBridge.cpp b/WebKit/android/WebCoreSupport/PlatformBridge.cpp index 284e6b361..1b249a4ac 100644 --- 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); -- 2.11.0