Title: [115643] trunk/Source
- Revision
- 115643
- Author
- [email protected]
- Date
- 2012-04-30 09:28:02 -0700 (Mon, 30 Apr 2012)
Log Message
[Chromium] Call defaultLocale directly
https://bugs.webkit.org/show_bug.cgi?id=85192
Reviewed by Kentaro Hara.
Part of a refactoring series. See tracking bug 82948.
Source/WebCore:
* platform/chromium/LanguageChromium.cpp:
(WebCore::platformLanguage):
* platform/chromium/PlatformSupport.h:
(PlatformSupport):
Source/WebKit/chromium:
* src/PlatformSupport.cpp:
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (115642 => 115643)
--- trunk/Source/WebCore/ChangeLog 2012-04-30 16:12:12 UTC (rev 115642)
+++ trunk/Source/WebCore/ChangeLog 2012-04-30 16:28:02 UTC (rev 115643)
@@ -1,3 +1,17 @@
+2012-04-30 Mark Pilgrim <[email protected]>
+
+ [Chromium] Call defaultLocale directly
+ https://bugs.webkit.org/show_bug.cgi?id=85192
+
+ Reviewed by Kentaro Hara.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * platform/chromium/LanguageChromium.cpp:
+ (WebCore::platformLanguage):
+ * platform/chromium/PlatformSupport.h:
+ (PlatformSupport):
+
2012-04-30 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=82922
Modified: trunk/Source/WebCore/platform/chromium/LanguageChromium.cpp (115642 => 115643)
--- trunk/Source/WebCore/platform/chromium/LanguageChromium.cpp 2012-04-30 16:12:12 UTC (rev 115642)
+++ trunk/Source/WebCore/platform/chromium/LanguageChromium.cpp 2012-04-30 16:28:02 UTC (rev 115643)
@@ -32,7 +32,7 @@
#include "Language.h"
#include "PlatformString.h"
-#include "PlatformSupport.h"
+#include <public/Platform.h>
#include <wtf/Vector.h>
namespace WebCore {
@@ -41,7 +41,7 @@
{
DEFINE_STATIC_LOCAL(String, computedDefaultLanguage, ());
if (computedDefaultLanguage.isEmpty())
- computedDefaultLanguage.append(PlatformSupport::computedDefaultLanguage());
+ computedDefaultLanguage.append(WebKit::Platform::current()->defaultLocale());
return computedDefaultLanguage;
}
Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (115642 => 115643)
--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-30 16:12:12 UTC (rev 115642)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h 2012-04-30 16:28:02 UTC (rev 115643)
@@ -188,9 +188,6 @@
static void notifyJSOutOfMemory(Frame*);
static bool allowScriptDespiteSettings(const KURL& documentURL);
- // Language -----------------------------------------------------------
- static String computedDefaultLanguage();
-
// LayoutTestMode -----------------------------------------------------
static bool layoutTestMode();
Modified: trunk/Source/WebKit/chromium/ChangeLog (115642 => 115643)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-30 16:12:12 UTC (rev 115642)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-30 16:28:02 UTC (rev 115643)
@@ -1,5 +1,17 @@
2012-04-30 Mark Pilgrim <[email protected]>
+ [Chromium] Call defaultLocale directly
+ https://bugs.webkit.org/show_bug.cgi?id=85192
+
+ Reviewed by Kentaro Hara.
+
+ Part of a refactoring series. See tracking bug 82948.
+
+ * src/PlatformSupport.cpp:
+ (WebCore):
+
+2012-04-30 Mark Pilgrim <[email protected]>
+
[Chromium] Use new syntax to call callOnMainThread directly
https://bugs.webkit.org/show_bug.cgi?id=85190
Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (115642 => 115643)
--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-30 16:12:12 UTC (rev 115642)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp 2012-04-30 16:28:02 UTC (rev 115643)
@@ -532,13 +532,6 @@
return webKitPlatformSupport()->injectIDBKeyIntoSerializedValue(key, value, keyPath);
}
-// Language -------------------------------------------------------------------
-
-String PlatformSupport::computedDefaultLanguage()
-{
- return webKitPlatformSupport()->defaultLocale();
-}
-
// LayoutTestMode -------------------------------------------------------------
bool PlatformSupport::layoutTestMode()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
