Log Message
Font size-related preference values should be CGFloats backed by doubles https://bugs.webkit.org/show_bug.cgi?id=128445
Reviewed by Filip Pizlo. * Shared/WebPreferencesStore.h: Changed minimumFontSize, minimumLogicalFontSize, defaultFontSize, and defaultFixedFontSize into double-value preferences. * UIProcess/API/Cocoa/WKPreferences.h: Changed minimumFontSize into CGFloat. * UIProcess/API/Cocoa/WKPreferences.mm: (-[WKPreferences minimumFontSize]): Changed return type. (-[WKPreferences setMinimumFontSize:]): Changed parameter type. * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::updatePreferences): Changed to use double getters.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (163701 => 163702)
--- trunk/Source/WebKit2/ChangeLog 2014-02-08 08:36:29 UTC (rev 163701)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-08 08:42:07 UTC (rev 163702)
@@ -1,3 +1,19 @@
+2014-02-08 Dan Bernstein <m...@apple.com>
+
+ Font size-related preference values should be CGFloats backed by doubles
+ https://bugs.webkit.org/show_bug.cgi?id=128445
+
+ Reviewed by Filip Pizlo.
+
+ * Shared/WebPreferencesStore.h: Changed minimumFontSize, minimumLogicalFontSize,
+ defaultFontSize, and defaultFixedFontSize into double-value preferences.
+ * UIProcess/API/Cocoa/WKPreferences.h: Changed minimumFontSize into CGFloat.
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences minimumFontSize]): Changed return type.
+ (-[WKPreferences setMinimumFontSize:]): Changed parameter type.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences): Changed to use double getters.
+
2014-02-08 Adrian Perez de Castro <ape...@igalia.com>
[GTK] Make process model names properly meaningful
Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (163701 => 163702)
--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-08 08:36:29 UTC (rev 163701)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2014-02-08 08:42:07 UTC (rev 163702)
@@ -195,6 +195,10 @@
#define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
macro(PDFScaleFactor, pdfScaleFactor, Double, double, 0) \
macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5) \
+ macro(MinimumFontSize, minimumFontSize, Double, double, 0) \
+ macro(MinimumLogicalFontSize, minimumLogicalFontSize, Double, double, 9) \
+ macro(DefaultFontSize, defaultFontSize, Double, double, 16) \
+ macro(DefaultFixedFontSize, defaultFixedFontSize, Double, double, 13) \
\
#define FOR_EACH_WEBKIT_FLOAT_PREFERENCE(macro) \
@@ -202,10 +206,6 @@
#define FOR_EACH_WEBKIT_UINT32_PREFERENCE(macro) \
macro(FontSmoothingLevel, fontSmoothingLevel, UInt32, uint32_t, FontSmoothingLevelMedium) \
- macro(MinimumFontSize, minimumFontSize, UInt32, uint32_t, 0) \
- macro(MinimumLogicalFontSize, minimumLogicalFontSize, UInt32, uint32_t, 9) \
- macro(DefaultFontSize, defaultFontSize, UInt32, uint32_t, 16) \
- macro(DefaultFixedFontSize, defaultFixedFontSize, UInt32, uint32_t, 13) \
macro(LayoutFallbackWidth, layoutFallbackWidth, UInt32, uint32_t, 980) \
macro(DeviceWidth, deviceWidth, UInt32, uint32_t, 0) \
macro(DeviceHeight, deviceHeight, UInt32, uint32_t, 0) \
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (163701 => 163702)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-02-08 08:36:29 UTC (rev 163701)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-02-08 08:42:07 UTC (rev 163702)
@@ -35,7 +35,7 @@
WK_API_CLASS
@interface WKPreferences : NSObject
-@property (nonatomic) unsigned minimumFontSize;
+@property (nonatomic) CGFloat minimumFontSize;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (163701 => 163702)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-02-08 08:36:29 UTC (rev 163701)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2014-02-08 08:42:07 UTC (rev 163702)
@@ -42,12 +42,12 @@
return self;
}
-- (unsigned)minimumFontSize
+- (CGFloat)minimumFontSize
{
return _preferences->minimumFontSize();
}
-- (void)setMinimumFontSize:(unsigned)minimumFontSize
+- (void)setMinimumFontSize:(CGFloat)minimumFontSize
{
_preferences->setMinimumFontSize(minimumFontSize);
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (163701 => 163702)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-08 08:36:29 UTC (rev 163701)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-08 08:42:07 UTC (rev 163702)
@@ -2437,10 +2437,10 @@
settings.setAllowUniversalAccessFromFileURLs(store.getBoolValueForKey(WebPreferencesKey::allowUniversalAccessFromFileURLsKey()));
settings.setAllowFileAccessFromFileURLs(store.getBoolValueForKey(WebPreferencesKey::allowFileAccessFromFileURLsKey()));
- settings.setMinimumFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumFontSizeKey()));
- settings.setMinimumLogicalFontSize(store.getUInt32ValueForKey(WebPreferencesKey::minimumLogicalFontSizeKey()));
- settings.setDefaultFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFontSizeKey()));
- settings.setDefaultFixedFontSize(store.getUInt32ValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
+ settings.setMinimumFontSize(store.getDoubleValueForKey(WebPreferencesKey::minimumFontSizeKey()));
+ settings.setMinimumLogicalFontSize(store.getDoubleValueForKey(WebPreferencesKey::minimumLogicalFontSizeKey()));
+ settings.setDefaultFontSize(store.getDoubleValueForKey(WebPreferencesKey::defaultFontSizeKey()));
+ settings.setDefaultFixedFontSize(store.getDoubleValueForKey(WebPreferencesKey::defaultFixedFontSizeKey()));
settings.setScreenFontSubstitutionEnabled(store.getBoolValueForKey(WebPreferencesKey::screenFontSubstitutionEnabledKey())
#if PLATFORM(MAC)
|| WebProcess::shared().shouldForceScreenFontSubstitution()
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
