Changeset 163663 in webkit
- Timestamp:
- Feb 7, 2014 4:37:32 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 6 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r163662 r163663 1 2014-02-07 Anders Carlsson <andersca@apple.com> 2 3 Implement more of WKPreferences 4 https://bugs.webkit.org/show_bug.cgi?id=128411 5 6 Reviewed by Tim Horton. 7 8 Give WKPreferences an underlying WebKit::WebPreferences object, add a minimumFontSize preference 9 and make sure that WKWebView's initializer creates a WKPreferences object if the configuration doesn't specify one. 10 11 * UIProcess/API/Cocoa/WKPreferences.h: 12 * UIProcess/API/Cocoa/WKPreferences.mm: 13 (-[WKPreferences init]): 14 (-[WKPreferences minimumFontSize]): 15 (-[WKPreferences setMinimumFontSize:]): 16 * UIProcess/API/Cocoa/WKPreferencesInternal.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm. 17 * UIProcess/API/Cocoa/WKWebView.mm: 18 (-[WKWebView initWithFrame:configuration:]): 19 * UIProcess/WebPageProxy.h: 20 * WebKit2.xcodeproj/project.pbxproj: 21 1 22 2014-02-07 Brady Eidson <beidson@apple.com> 2 23 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h
r162650 r163663 36 36 @interface WKPreferences : NSObject 37 37 38 @property (nonatomic) int minimumFontSize; 39 38 40 @end 39 41 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm
r162654 r163663 24 24 */ 25 25 26 #i nclude"config.h"27 #i nclude "WKPreferences.h"26 #import "config.h" 27 #import "WKPreferencesInternal.h" 28 28 29 29 #if WK_API_ENABLED 30 30 31 #import "WebPreferences.h" 32 31 33 @implementation WKPreferences 34 35 - (instancetype)init 36 { 37 if ((self = [super init])) 38 return nil; 39 40 _preferences = WebKit::WebPreferences::create(String()); 41 42 return self; 43 } 44 45 - (int)minimumFontSize 46 { 47 return _preferences->minimumFontSize(); 48 } 49 50 - (void)setMinimumFontSize:(int)minimumFontSize 51 { 52 _preferences->setMinimumFontSize(minimumFontSize); 53 } 32 54 33 55 @end -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h
r163662 r163663 24 24 */ 25 25 26 #include "config.h" 27 #include "WKPreferences.h" 26 #import "WKPreferences.h" 28 27 29 28 #if WK_API_ENABLED 30 29 31 @implementation WKPreferences 30 #import <wtf/RefPtr.h> 31 32 namespace WebKit { 33 class WebPreferences; 34 } 35 36 @interface WKPreferences () { 37 RefPtr<WebKit::WebPreferences> _preferences; 38 } 32 39 33 40 @end 34 41 35 #endif // WK_API_ENABLED42 #endif -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
r163578 r163663 35 35 #import "WKNavigationDelegate.h" 36 36 #import "WKNavigationInternal.h" 37 #import "WKPreferencesInternal.h" 37 38 #import "WKProcessClass.h" 38 39 #import "WKRemoteObjectRegistryInternal.h" … … 87 88 [_configuration setProcessClass:adoptNS([[WKProcessClass alloc] init]).get()]; 88 89 90 if (![_configuration preferences]) 91 [_configuration setPreferences:adoptNS([[WKPreferences alloc] init]).get()]; 92 89 93 CGRect bounds = self.bounds; 90 94 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r163656 r163663 332 332 , public IPC::MessageSender { 333 333 public: 334 335 334 static PassRefPtr<WebPageProxy> create(PageClient&, WebProcessProxy&, WebPageGroup&, WebPreferences&, API::Session&, uint64_t pageID); 336 335 virtual ~WebPageProxy(); -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r163640 r163663 150 150 1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; }; 151 151 1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; }; 152 1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; }; 152 153 1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */; }; 153 154 1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; settings = {ATTRIBUTES = (Public, ); }; }; … … 1812 1813 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMapMessageReceiver.cpp; sourceTree = "<group>"; }; 1813 1814 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMapMessages.h; sourceTree = "<group>"; }; 1815 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesInternal.h; sourceTree = "<group>"; }; 1814 1816 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; }; 1815 1817 1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; }; … … 4349 4351 1AFDD3161891C94700153970 /* WKPreferences.h */, 4350 4352 1AFDD3181891CA1200153970 /* WKPreferences.mm */, 4353 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */, 4351 4354 1A158418189044F50017616C /* WKProcessClass.h */, 4352 4355 1A158417189044F50017616C /* WKProcessClass.mm */, … … 6865 6868 1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */, 6866 6869 5175095A1897249700408FAC /* IDBIdentifier.h in Headers */, 6870 1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */, 6867 6871 BC407608124FF0270068F20A /* WKType.h in Headers */, 6868 6872 7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */,
Note: See TracChangeset
for help on using the changeset viewer.