diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 5e83d9034827d5d7fbc691941446d7be1a9a0374..84c8c053ce4a7a5be4fea69c90b321e4ceea2b4a 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,15 @@ +2012-06-08 Eli Fidler + + [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 Final set of chromium rebaselines for skia change. See crbug.com/131829. diff --git a/LayoutTests/fonts/valid-standard-font-expected.txt b/LayoutTests/fonts/valid-standard-font-expected.txt new file mode 100644 index 0000000000000000000000000000000000000000..aa44e7c9f911b7292913aae4ed5ac17c804b9283 --- /dev/null +++ b/LayoutTests/fonts/valid-standard-font-expected.txt @@ -0,0 +1,2 @@ + +PASS diff --git a/LayoutTests/fonts/valid-standard-font.html b/LayoutTests/fonts/valid-standard-font.html new file mode 100644 index 0000000000000000000000000000000000000000..0edead98b2af4c400b675b9c62572923c6367127 --- /dev/null +++ b/LayoutTests/fonts/valid-standard-font.html @@ -0,0 +1,20 @@ + + + + + +
FAIL
+ + diff --git a/Source/WebKit/blackberry/Api/WebPage.cpp b/Source/WebKit/blackberry/Api/WebPage.cpp index c3546733f5b2285f93958555b8d4b7c63f98ddb0..bfe7d74dfac87c1cee40e0a1a1d6af793a4739c1 100644 --- a/Source/WebKit/blackberry/Api/WebPage.cpp +++ b/Source/WebKit/blackberry/Api/WebPage.cpp @@ -6206,10 +6206,14 @@ void WebPagePrivate::didChangeSettings(WebSettings* webSettings) coreSettings->setDefaultFixedFontSize(webSettings->defaultFixedFontSize()); 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()? coreSettings->setPluginsEnabled(webSettings->arePluginsEnabled()); diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog index 999e9aa00cf6da471f1e686671bfa5580c24abf9..599ccff891d1331194eb3b5a2420d167b8462f01 100644 --- a/Source/WebKit/blackberry/ChangeLog +++ b/Source/WebKit/blackberry/ChangeLog @@ -1,3 +1,17 @@ +2012-06-08 Eli Fidler + + [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 [BlackBerry] Should Use the WebPage Already Created by Client, No Need to Create New One.