Changeset 163663 in webkit


Ignore:
Timestamp:
Feb 7, 2014 4:37:32 PM (10 years ago)
Author:
andersca@apple.com
Message:

Implement more of WKPreferences
https://bugs.webkit.org/show_bug.cgi?id=128411

Reviewed by Tim Horton.

Give WKPreferences an underlying WebKit::WebPreferences object, add a minimumFontSize preference
and make sure that WKWebView's initializer creates a WKPreferences object if the configuration doesn't specify one.

  • UIProcess/API/Cocoa/WKPreferences.h:
  • UIProcess/API/Cocoa/WKPreferences.mm:

(-[WKPreferences init]):
(-[WKPreferences minimumFontSize]):
(-[WKPreferences setMinimumFontSize:]):

  • UIProcess/API/Cocoa/WKPreferencesInternal.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm.
  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithFrame:configuration:]):

  • UIProcess/WebPageProxy.h:
  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r163662 r163663  
     12014-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
    1222014-02-07  Brady Eidson  <beidson@apple.com>
    223
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h

    r162650 r163663  
    3636@interface WKPreferences : NSObject
    3737
     38@property (nonatomic) int minimumFontSize;
     39
    3840@end
    3941
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm

    r162654 r163663  
    2424 */
    2525
    26 #include "config.h"
    27 #include "WKPreferences.h"
     26#import "config.h"
     27#import "WKPreferencesInternal.h"
    2828
    2929#if WK_API_ENABLED
    3030
     31#import "WebPreferences.h"
     32
    3133@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}
    3254
    3355@end
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesInternal.h

    r163662 r163663  
    2424 */
    2525
    26 #include "config.h"
    27 #include "WKPreferences.h"
     26#import "WKPreferences.h"
    2827
    2928#if WK_API_ENABLED
    3029
    31 @implementation WKPreferences
     30#import <wtf/RefPtr.h>
     31
     32namespace WebKit {
     33class WebPreferences;
     34}
     35
     36@interface WKPreferences () {
     37    RefPtr<WebKit::WebPreferences> _preferences;
     38}
    3239
    3340@end
    3441
    35 #endif // WK_API_ENABLED
     42#endif
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r163578 r163663  
    3535#import "WKNavigationDelegate.h"
    3636#import "WKNavigationInternal.h"
     37#import "WKPreferencesInternal.h"
    3738#import "WKProcessClass.h"
    3839#import "WKRemoteObjectRegistryInternal.h"
     
    8788        [_configuration setProcessClass:adoptNS([[WKProcessClass alloc] init]).get()];
    8889
     90    if (![_configuration preferences])
     91        [_configuration setPreferences:adoptNS([[WKPreferences alloc] init]).get()];
     92
    8993    CGRect bounds = self.bounds;
    9094
  • trunk/Source/WebKit2/UIProcess/WebPageProxy.h

    r163656 r163663  
    332332    , public IPC::MessageSender {
    333333public:
    334 
    335334    static PassRefPtr<WebPageProxy> create(PageClient&, WebProcessProxy&, WebPageGroup&, WebPreferences&, API::Session&, uint64_t pageID);
    336335    virtual ~WebPageProxy();
  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r163640 r163663  
    150150                1A334DED16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */; };
    151151                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A334DEC16DE8F88006A8E38 /* StorageAreaMapMessages.h */; };
     152                1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */; };
    152153                1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */; };
    153154                1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; settings = {ATTRIBUTES = (Public, ); }; };
     
    18121813                1A334DEB16DE8F88006A8E38 /* StorageAreaMapMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMapMessageReceiver.cpp; sourceTree = "<group>"; };
    18131814                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>"; };
    18141816                1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; };
    18151817                1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; };
     
    43494351                                1AFDD3161891C94700153970 /* WKPreferences.h */,
    43504352                                1AFDD3181891CA1200153970 /* WKPreferences.mm */,
     4353                                1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */,
    43514354                                1A158418189044F50017616C /* WKProcessClass.h */,
    43524355                                1A158417189044F50017616C /* WKProcessClass.mm */,
     
    68656868                                1A4A9AA812B7E796008FE984 /* WKTextInputWindowController.h in Headers */,
    68666869                                5175095A1897249700408FAC /* IDBIdentifier.h in Headers */,
     6870                                1A3C888018A5ABAE00C4C962 /* WKPreferencesInternal.h in Headers */,
    68676871                                BC407608124FF0270068F20A /* WKType.h in Headers */,
    68686872                                7CD5EBBF1746B04C000C1C45 /* WKTypeRefWrapper.h in Headers */,
Note: See TracChangeset for help on using the changeset viewer.