Changeset 119879 in webkit
- Timestamp:
- Jun 8, 2012 5:07:36 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r119875 r119879 1 2012-06-08 Eli Fidler <efidler@rim.com> 2 3 [BlackBerry] Default font settings are getting deleted 4 https://bugs.webkit.org/show_bug.cgi?id=88670 5 6 Reviewed by Rob Buis. 7 8 This test crashes if -webkit-body (i.e. WebCore::Settings::standardFontFamily()) 9 is not a valid font family. 10 11 * fonts/valid-standard-font.html: Added. 12 1 13 2012-06-08 Ojan Vafai <ojan@chromium.org> 2 14 -
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
r119771 r119879 6207 6207 coreSettings->setDefaultFontSize(webSettings->defaultFontSize()); 6208 6208 coreSettings->setMinimumLogicalFontSize(webSettings->minimumFontSize()); 6209 coreSettings->setSerifFontFamily(webSettings->serifFontFamily().impl()); 6210 coreSettings->setFixedFontFamily(webSettings->fixedFontFamily().impl()); 6211 coreSettings->setSansSerifFontFamily(webSettings->sansSerifFontFamily().impl()); 6212 coreSettings->setStandardFontFamily(webSettings->standardFontFamily().impl()); 6209 if (!webSettings->serifFontFamily().isEmpty()) 6210 coreSettings->setSerifFontFamily(webSettings->serifFontFamily().impl()); 6211 if (!webSettings->fixedFontFamily().isEmpty()) 6212 coreSettings->setFixedFontFamily(webSettings->fixedFontFamily().impl()); 6213 if (!webSettings->sansSerifFontFamily().isEmpty()) 6214 coreSettings->setSansSerifFontFamily(webSettings->sansSerifFontFamily().impl()); 6215 if (!webSettings->standardFontFamily().isEmpty()) 6216 coreSettings->setStandardFontFamily(webSettings->standardFontFamily().impl()); 6213 6217 coreSettings->setJavaScriptCanOpenWindowsAutomatically(webSettings->canJavaScriptOpenWindowsAutomatically()); 6214 6218 coreSettings->setAllowScriptsToCloseWindows(webSettings->canJavaScriptOpenWindowsAutomatically()); // Why are we using the same value as setJavaScriptCanOpenWindowsAutomatically()? -
trunk/Source/WebKit/blackberry/ChangeLog
r119774 r119879 1 2012-06-08 Eli Fidler <efidler@rim.com> 2 3 [BlackBerry] Default font settings are getting deleted 4 https://bugs.webkit.org/show_bug.cgi?id=88670 5 6 Reviewed by Rob Buis. 7 8 RIM PR: 163720 9 10 WebSettings is overriding the default font settings with "", which deletes them. 11 12 * Api/WebPage.cpp: 13 (BlackBerry::WebKit::WebPagePrivate::didChangeSettings): 14 1 15 2012-06-07 Crystal Zhang <haizhang@rim.com> 2 16
Note: See TracChangeset
for help on using the changeset viewer.