diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 20:08:15 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:38:51 +0100 |
| commit | 9fb42e52f91229f48fbc922ad3939ecd5ecdd727 (patch) | |
| tree | 04645e2688232cadfba27aebf630e92be876243e | |
| parent | 2652a7b1570ad20e22abf24360cdcb4d55590a3d (diff) | |
| download | external_webkit-9fb42e52f91229f48fbc922ad3939ecd5ecdd727.zip external_webkit-9fb42e52f91229f48fbc922ad3939ecd5ecdd727.tar.gz external_webkit-9fb42e52f91229f48fbc922ad3939ecd5ecdd727.tar.bz2 | |
Merge Webkit at r70209: defaultLanguage has been renamed.
It is now known as defaultPlatformLanguage.
See http://trac.webkit.org/changeset/70095
Change-Id: I523e93e78317a2e365429a8027967aa46d0370fa
| -rw-r--r-- | WebCore/platform/android/TemporaryLinkStubs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/platform/android/TemporaryLinkStubs.cpp b/WebCore/platform/android/TemporaryLinkStubs.cpp index 3c5c8b4..3997739 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"; |