From 9fb42e52f91229f48fbc922ad3939ecd5ecdd727 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Fri, 22 Oct 2010 20:08:15 +0100 Subject: [PATCH] Merge Webkit at r70209: defaultLanguage has been renamed. It is now known as defaultPlatformLanguage. See http://trac.webkit.org/changeset/70095 Change-Id: I523e93e78317a2e365429a8027967aa46d0370fa --- WebCore/platform/android/TemporaryLinkStubs.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp index 3c5c8b48d..3997739fa 100644 --- a/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -94,7 +94,7 @@ using namespace WebCore; // 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() +String WebCore::platformDefaultLanguage() { verifiedOk(); return "en"; -- 2.11.0