Title: [129596] trunk/Source/WebKit2
- Revision
- 129596
- Author
- [email protected]
- Date
- 2012-09-25 23:03:20 -0700 (Tue, 25 Sep 2012)
Log Message
Try to fix non-Mac builds.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (129595 => 129596)
--- trunk/Source/WebKit2/ChangeLog 2012-09-26 05:58:08 UTC (rev 129595)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-26 06:03:20 UTC (rev 129596)
@@ -1,5 +1,12 @@
2012-09-25 Dan Bernstein <[email protected]>
+ Try to fix non-Mac builds.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
+2012-09-25 Dan Bernstein <[email protected]>
+
WebKit2 part of <rdar://problem/11455228> [mac] Stop using screen fonts
https://bugs.webkit.org/show_bug.cgi?id=97620
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (129595 => 129596)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-09-26 05:58:08 UTC (rev 129595)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-09-26 06:03:20 UTC (rev 129596)
@@ -2072,7 +2072,11 @@
settings->setMinimumLogicalFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumLogicalFontSizeKey()));
settings->setDefaultFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFontSizeKey()));
settings->setDefaultFixedFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
- settings->setScreenFontSubstitutionEnabled(store.getBoolValueForKey(WebPreferencesKey::screenFontSubstitutionEnabledKey()) || WebProcess::shared().shouldForceScreenFontSubstitution());
+ settings->setScreenFontSubstitutionEnabled(store.getBoolValueForKey(WebPreferencesKey::screenFontSubstitutionEnabledKey())
+#if PLATFORM(MAC)
+ || WebProcess::shared().shouldForceScreenFontSubstitution()
+#endif
+ );
settings->setLayoutFallbackWidth(store.getUInt32ValueForKey(WebPreferencesKey::layoutFallbackWidthKey()));
settings->setDeviceWidth(store.getUInt32ValueForKey(WebPreferencesKey::deviceWidthKey()));
settings->setDeviceHeight(store.getUInt32ValueForKey(WebPreferencesKey::deviceHeightKey()));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
