Title: [123934] trunk/Source
Revision
123934
Author
[email protected]
Date
2012-07-27 16:29:20 -0700 (Fri, 27 Jul 2012)

Log Message

[BlackBerry] Adapt to change in the FontInfo platform API.
https://bugs.webkit.org/show_bug.cgi?id=92547

Patch by Eli Fidler <[email protected]> on 2012-07-27
Reviewed by Yong Li

RIM PR 161263

Source/WebCore:

* page/blackberry/SettingsBlackBerry.cpp:
(WebCore::Settings::initializeDefaultFontFamilies):

Source/WebKit/blackberry:

* Api/WebSettings.cpp:
(BlackBerry::WebKit::WebSettings::standardSettings):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (123933 => 123934)


--- trunk/Source/WebCore/ChangeLog	2012-07-27 23:12:33 UTC (rev 123933)
+++ trunk/Source/WebCore/ChangeLog	2012-07-27 23:29:20 UTC (rev 123934)
@@ -1,3 +1,15 @@
+2012-07-27  Eli Fidler  <[email protected]>
+
+        [BlackBerry] Adapt to change in the FontInfo platform API.
+        https://bugs.webkit.org/show_bug.cgi?id=92547
+
+        Reviewed by Yong Li
+
+        RIM PR 161263
+
+        * page/blackberry/SettingsBlackBerry.cpp:
+        (WebCore::Settings::initializeDefaultFontFamilies):
+
 2012-07-27  Antoine Labour  <[email protected]>
 
         [chromium] Fix color matrix filter computation so that filters that don't need clamping are correctly detected as such

Modified: trunk/Source/WebCore/page/blackberry/SettingsBlackBerry.cpp (123933 => 123934)


--- trunk/Source/WebCore/page/blackberry/SettingsBlackBerry.cpp	2012-07-27 23:12:33 UTC (rev 123933)
+++ trunk/Source/WebCore/page/blackberry/SettingsBlackBerry.cpp	2012-07-27 23:29:20 UTC (rev 123934)
@@ -45,19 +45,19 @@
 
 void Settings::initializeDefaultFontFamilies()
 {
-    setCursiveFontFamily(BlackBerry::Platform::fontFamily("-webkit-cursive", "").c_str());
-    setFantasyFontFamily(BlackBerry::Platform::fontFamily("-webkit-fantasy", "").c_str());
-    setFixedFontFamily(BlackBerry::Platform::fontFamily("-webkit-monospace", "").c_str());
-    setSansSerifFontFamily(BlackBerry::Platform::fontFamily("-webkit-sans-serif", "").c_str());
-    setSerifFontFamily(BlackBerry::Platform::fontFamily("-webkit-serif", "").c_str());
-    setStandardFontFamily(BlackBerry::Platform::fontFamily("-webkit-standard", "").c_str());
+    setCursiveFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-cursive", "").c_str());
+    setFantasyFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-fantasy", "").c_str());
+    setFixedFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-monospace", "").c_str());
+    setSansSerifFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-sans-serif", "").c_str());
+    setSerifFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-serif", "").c_str());
+    setStandardFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-standard", "").c_str());
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(languages); ++i) {
         UScriptCode script = localeToScriptCodeForFontSelection(languages[i]);
-        setFixedFontFamily(BlackBerry::Platform::fontFamily("monospace", languages[i]).c_str(), script);
-        setSansSerifFontFamily(BlackBerry::Platform::fontFamily("sans-serif", languages[i]).c_str(), script);
-        setSerifFontFamily(BlackBerry::Platform::fontFamily("serif", languages[i]).c_str(), script);
-        setStandardFontFamily(BlackBerry::Platform::fontFamily("", languages[i]).c_str(), script);
+        setFixedFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("monospace", languages[i]).c_str(), script);
+        setSansSerifFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("sans-serif", languages[i]).c_str(), script);
+        setSerifFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("serif", languages[i]).c_str(), script);
+        setStandardFontFamily(BlackBerry::Platform::FontInfo::instance()->fontFamily("", languages[i]).c_str(), script);
     }
 }
 

Modified: trunk/Source/WebKit/blackberry/Api/WebSettings.cpp (123933 => 123934)


--- trunk/Source/WebKit/blackberry/Api/WebSettings.cpp	2012-07-27 23:12:33 UTC (rev 123933)
+++ trunk/Source/WebKit/blackberry/Api/WebSettings.cpp	2012-07-27 23:29:20 UTC (rev 123934)
@@ -200,10 +200,10 @@
     settings->m_private->setInteger(WebKitMinimumFontSize, 8);
     settings->m_private->setBoolean(WebKitWebSocketsEnabled, true);
 
-    settings->m_private->setString(WebKitFixedFontFamily, BlackBerry::Platform::fontFamily("-webkit-monospace", "").c_str());
-    settings->m_private->setString(WebKitSansSeriffFontFamily, BlackBerry::Platform::fontFamily("-webkit-sans-serif", "").c_str());
-    settings->m_private->setString(WebKitSeriffFontFamily, BlackBerry::Platform::fontFamily("-webkit-serif", "").c_str());
-    settings->m_private->setString(WebKitStandardFontFamily, BlackBerry::Platform::fontFamily("-webkit-standard", "").c_str());
+    settings->m_private->setString(WebKitFixedFontFamily, BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-monospace", "").c_str());
+    settings->m_private->setString(WebKitSansSeriffFontFamily, BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-sans-serif", "").c_str());
+    settings->m_private->setString(WebKitSeriffFontFamily, BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-serif", "").c_str());
+    settings->m_private->setString(WebKitStandardFontFamily, BlackBerry::Platform::FontInfo::instance()->fontFamily("-webkit-standard", "").c_str());
 
     return settings;
 }

Modified: trunk/Source/WebKit/blackberry/ChangeLog (123933 => 123934)


--- trunk/Source/WebKit/blackberry/ChangeLog	2012-07-27 23:12:33 UTC (rev 123933)
+++ trunk/Source/WebKit/blackberry/ChangeLog	2012-07-27 23:29:20 UTC (rev 123934)
@@ -1,3 +1,15 @@
+2012-07-27  Eli Fidler  <[email protected]>
+
+        [BlackBerry] Adapt to change in the FontInfo platform API.
+        https://bugs.webkit.org/show_bug.cgi?id=92547
+
+        Reviewed by Yong Li
+
+        RIM PR 161263
+
+        * Api/WebSettings.cpp:
+        (BlackBerry::WebKit::WebSettings::standardSettings):
+
 2012-07-27  Yong Li  <[email protected]>
 
         [BlackBerry] Should support onbeforeunload event and show confirmation dialog
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to