Changeset 119879 in webkit

Timestamp:

Jun 8, 2012 5:07:36 PM (12 years ago)

Author:

efidler@rim.com

Message:

[BlackBerry] Default font settings are getting deleted
​https://bugs.webkit.org/show_bug.cgi?id=88670

Reviewed by Rob Buis.

Source/WebKit/blackberry:

RIM PR: 163720

WebSettings is overriding the default font settings with "", which deletes them.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::didChangeSettings):

LayoutTests:

This test crashes if -webkit-body (i.e. WebCore::Settings::standardFontFamily())
is not a valid font family.

• fonts/valid-standard-font.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fonts/valid-standard-font-expected.txt (added)
• LayoutTests/fonts/valid-standard-font.html (added)
• Source/WebKit/blackberry/Api/WebPage.cpp (modified) (1 diff)
• Source/WebKit/blackberry/ChangeLog (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-06-08  Eli Fidler  <efidler@rim.com>
+
+        [BlackBerry] Default font settings are getting deleted
+        https://bugs.webkit.org/show_bug.cgi?id=88670
+
+        Reviewed by Rob Buis.
+
+        This test crashes if -webkit-body (i.e.  WebCore::Settings::standardFontFamily())
+        is not a valid font family.
+
+        * fonts/valid-standard-font.html: Added.
+
 2012-06-08  Ojan Vafai  <ojan@chromium.org>
 

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -6207 +6207 @@
     coreSettings->setDefaultFontSize(webSettings->defaultFontSize());
     coreSettings->setMinimumLogicalFontSize(webSettings->minimumFontSize());
-    coreSettings->setSerifFontFamily(webSettings->serifFontFamily().impl());
-    coreSettings->setFixedFontFamily(webSettings->fixedFontFamily().impl());
-    coreSettings->setSansSerifFontFamily(webSettings->sansSerifFontFamily().impl());
-    coreSettings->setStandardFontFamily(webSettings->standardFontFamily().impl());
+    if (!webSettings->serifFontFamily().isEmpty())
+        coreSettings->setSerifFontFamily(webSettings->serifFontFamily().impl());
+    if (!webSettings->fixedFontFamily().isEmpty())
+        coreSettings->setFixedFontFamily(webSettings->fixedFontFamily().impl());
+    if (!webSettings->sansSerifFontFamily().isEmpty())
+        coreSettings->setSansSerifFontFamily(webSettings->sansSerifFontFamily().impl());
+    if (!webSettings->standardFontFamily().isEmpty())
+        coreSettings->setStandardFontFamily(webSettings->standardFontFamily().impl());
     coreSettings->setJavaScriptCanOpenWindowsAutomatically(webSettings->canJavaScriptOpenWindowsAutomatically());
     coreSettings->setAllowScriptsToCloseWindows(webSettings->canJavaScriptOpenWindowsAutomatically()); // Why are we using the same value as setJavaScriptCanOpenWindowsAutomatically()?

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-06-08  Eli Fidler  <efidler@rim.com>
+
+        [BlackBerry] Default font settings are getting deleted
+        https://bugs.webkit.org/show_bug.cgi?id=88670
+
+        Reviewed by Rob Buis.
+
+        RIM PR: 163720
+
+        WebSettings is overriding the default font settings with "", which deletes them.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::didChangeSettings):
+
 2012-06-07  Crystal Zhang  <haizhang@rim.com>