Title: [192313] trunk/Source/WebKit2
- Revision
- 192313
- Author
- timothy_hor...@apple.com
- Date
- 2015-11-11 10:12:53 -0800 (Wed, 11 Nov 2015)
Log Message
Add some font-related preferences to the modern API
https://bugs.webkit.org/show_bug.cgi?id=151138
<rdar://problem/23492636>
Reviewed by Anders Carlsson.
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _defaultFontSize]):
(-[WKPreferences _setDefaultFontSize:]):
(-[WKPreferences _defaultFixedPitchFontSize]):
(-[WKPreferences _setDefaultFixedPitchFontSize:]):
(-[WKPreferences _fixedPitchFontFamily]):
(-[WKPreferences _setFixedPitchFontFamily:]):
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (192312 => 192313)
--- trunk/Source/WebKit2/ChangeLog 2015-11-11 18:03:00 UTC (rev 192312)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-11 18:12:53 UTC (rev 192313)
@@ -1,3 +1,20 @@
+2015-11-11 Tim Horton <timothy_hor...@apple.com>
+
+ Add some font-related preferences to the modern API
+ https://bugs.webkit.org/show_bug.cgi?id=151138
+ <rdar://problem/23492636>
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _defaultFontSize]):
+ (-[WKPreferences _setDefaultFontSize:]):
+ (-[WKPreferences _defaultFixedPitchFontSize]):
+ (-[WKPreferences _setDefaultFixedPitchFontSize:]):
+ (-[WKPreferences _fixedPitchFontFamily]):
+ (-[WKPreferences _setFixedPitchFontFamily:]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+
2015-11-11 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Runtime critical warnings when closing a page containing windowed plugins
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (192312 => 192313)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-11-11 18:03:00 UTC (rev 192312)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2015-11-11 18:12:53 UTC (rev 192313)
@@ -347,6 +347,36 @@
_preferences->setAntialiasedFontDilationEnabled(antialiasedFontDilationEnabled);
}
+- (NSUInteger)_defaultFontSize
+{
+ return _preferences->defaultFontSize();
+}
+
+- (void)_setDefaultFontSize:(NSUInteger)defaultFontSize
+{
+ _preferences->setDefaultFontSize(defaultFontSize);
+}
+
+- (NSUInteger)_defaultFixedPitchFontSize
+{
+ return _preferences->defaultFixedFontSize();
+}
+
+- (void)_setDefaultFixedPitchFontSize:(NSUInteger)defaultFixedPitchFontSize
+{
+ _preferences->setDefaultFixedFontSize(defaultFixedPitchFontSize);
+}
+
+- (NSString *)_fixedPitchFontFamily
+{
+ return _preferences->fixedFontFamily();
+}
+
+- (void)_setFixedPitchFontFamily:(NSString *)fixedPitchFontFamily
+{
+ _preferences->setFixedFontFamily(fixedPitchFontFamily);
+}
+
@end
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (192312 => 192313)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2015-11-11 18:03:00 UTC (rev 192312)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2015-11-11 18:12:53 UTC (rev 192313)
@@ -76,6 +76,10 @@
@property (nonatomic, setter=_setAntialiasedFontDilationEnabled:) BOOL _antialiasedFontDilationEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, setter=_setDefaultFontSize:) NSUInteger _defaultFontSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, setter=_setDefaultFixedPitchFontSize:) NSUInteger _defaultFixedPitchFontSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, copy, setter=_setFixedPitchFontFamily:) NSString *_fixedPitchFontFamily WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
// FIXME: This should be configured on the WKWebsiteDataStore.
// FIXME: This property should not have the verb "is" in it.
@property (nonatomic, setter=_setOfflineApplicationCacheIsEnabled:) BOOL _offlineApplicationCacheIsEnabled;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
