Changeset 148228 in webkit

Timestamp:

Apr 11, 2013 1:08:32 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Use the platform list of languages with fonts instead of hardcoding
​https://bugs.webkit.org/show_bug.cgi?id=114452

Patch by Eli Fidler <​efidler@blackberry.com> on 2013-04-11
Reviewed by Rob Buis.

BlackBerry PR 325244
Internally reviewed by Jeff Rogers

No functional change, but platform font changes won't need a WebKit change
going forward.

• page/blackberry/SettingsBlackBerry.cpp:

(WebCore::Settings::initializeDefaultFontFamilies):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/blackberry/SettingsBlackBerry.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-11  Eli Fidler  <efidler@blackberry.com>
+
+        [BlackBerry] Use the platform list of languages with fonts instead of hardcoding
+        https://bugs.webkit.org/show_bug.cgi?id=114452
+
+        Reviewed by Rob Buis.
+
+        BlackBerry PR 325244
+        Internally reviewed by Jeff Rogers
+
+        No functional change, but platform font changes won't need a WebKit change
+        going forward.
+
+        * page/blackberry/SettingsBlackBerry.cpp:
+        (WebCore::Settings::initializeDefaultFontFamilies):
+
 2013-04-11  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/page/blackberry/SettingsBlackBerry.cpp

@@ -28 +28 @@
 void Settings::initializeDefaultFontFamilies()
 {
-    static const char* kLanguages[] = {
-        "ar",
-        "bn",
-        "gu",
-        "he",
-        "hi",
-        "ja",
-        "kn",
-        "ko",
-        "ml",
-        "pa",
-        "ta",
-        "te",
-        "th",
-        "zh-CN",
-        "zh-TW",
-    };
-
-    static BlackBerry::Platform::String* languages[WTF_ARRAY_LENGTH(kLanguages)];
+    static std::vector<BlackBerry::Platform::String> languages;
     static bool init = false;
     if (!init) {
-        for (size_t i = 0; i < WTF_ARRAY_LENGTH(kLanguages); ++i)
-            languages[i] = new BlackBerry::Platform::String(kLanguages[i]);
+        languages = BlackBerry::Platform::FontInfo::instance()->languagesWithFonts();
         init = true;
     }
@@ -71 +52 @@
     STATIC_LOCAL_STRING(s_serif, "serif");
     STATIC_LOCAL_STRING(s_sansSerif, "sans-serif");
-    for (size_t i = 0; i < WTF_ARRAY_LENGTH(languages); ++i) {
-        UScriptCode script = localeToScriptCodeForFontSelection(*languages[i]);
-        setFixedFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily(s_monospace, *languages[i]), script);
-        setSansSerifFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily(s_sansSerif, *languages[i]), script);
-        setSerifFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily(s_serif, *languages[i]), script);
-        setStandardFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily(BlackBerry::Platform::String::emptyString(), *languages[i]), script);
+    for (size_t i = 0; i < languages.size(); ++i) {
+        UScriptCode script = localeToScriptCodeForFontSelection(languages[i]);
+        setFixedFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily(s_monospace, languages[i]), script);
+        setSansSerifFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily(s_sansSerif, languages[i]), script);
+        setSerifFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily(s_serif, languages[i]), script);
+        setStandardFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily(BlackBerry::Platform::String::emptyString(), languages[i]), script);
     }
 }