Changeset 166598 in webkit


Ignore:
Timestamp:
Apr 1, 2014 11:48:31 AM (10 years ago)
Author:
andersca@apple.com
Message:

Stub out the web process -> UI process message SPI
​https://bugs.webkit.org/show_bug.cgi?id=131048

Reviewed by Sam Weinig.

  • UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithFrame:configuration:]):

  • UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _userContentController]):
(-[WKWebViewConfiguration _setUserContentController:]):

  • UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
  • UIProcess/API/Cocoa/WKWebViewPrivate.h:
  • UIProcess/API/Cocoa/_WKScriptMessage.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
  • UIProcess/API/Cocoa/_WKScriptMessage.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.

(-[_WKScriptMessage body]):
(-[_WKScriptMessage originatingWebView]):

  • UIProcess/API/Cocoa/_WKScriptMessageHandler.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
  • UIProcess/API/Cocoa/_WKScriptWorld.h:
  • UIProcess/API/Cocoa/_WKUserContentController.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
  • UIProcess/API/Cocoa/_WKUserContentController.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h.

(-[_WKUserContentController addScriptMessageHandler:name:world:]):
(-[_WKUserContentController removeScriptMessageHandler:]):

  • WebKit2.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit2
Files:
7 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r166597 r166598  
     12014-04-01  Anders Carlsson  <andersca@apple.com>
     2
     3        Stub out the web process -> UI process message SPI
     4        https://bugs.webkit.org/show_bug.cgi?id=131048
     5
     6        Reviewed by Sam Weinig.
     7
     8        * UIProcess/API/Cocoa/WKWebView.mm:
     9        (-[WKWebView initWithFrame:configuration:]):
     10        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
     11        (-[WKWebViewConfiguration copyWithZone:]):
     12        (-[WKWebViewConfiguration _userContentController]):
     13        (-[WKWebViewConfiguration _setUserContentController:]):
     14        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
     15        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
     16        * UIProcess/API/Cocoa/_WKScriptMessage.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
     17        * UIProcess/API/Cocoa/_WKScriptMessage.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
     18        (-[_WKScriptMessage body]):
     19        (-[_WKScriptMessage originatingWebView]):
     20        * UIProcess/API/Cocoa/_WKScriptMessageHandler.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
     21        * UIProcess/API/Cocoa/_WKScriptWorld.h:
     22        * UIProcess/API/Cocoa/_WKUserContentController.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
     23        * UIProcess/API/Cocoa/_WKUserContentController.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h.
     24        (-[_WKUserContentController addScriptMessageHandler:name:world:]):
     25        (-[_WKUserContentController removeScriptMessageHandler:]):
     26        * WebKit2.xcodeproj/project.pbxproj:
     27
    1282014-04-01  Andreas Kling  <akling@apple.com>
    229

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

    r166466 r166598  
    5555#import "WebProcessProxy.h"
    5656#import "_WKRemoteObjectRegistryInternal.h"
     57#import "_WKUserContentController.h"
    5758#import "_WKVisitedLinkProviderInternal.h"
    5859#import <wtf/RetainPtr.h>
    … …  
    132133    if (![_configuration preferences])
    133134        [_configuration setPreferences:adoptNS([[WKPreferences alloc] init]).get()];
     135
     136    if (![_configuration _userContentController])
     137        [_configuration _setUserContentController:adoptNS([[_WKUserContentController alloc] init]).get()];
    134138
    135139    if (![_configuration _visitedLinkProvider])

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

    r165619 r166598  
    3636    RetainPtr<WKProcessPool> _processPool;
    3737    RetainPtr<WKPreferences> _preferences;
     38    RetainPtr<_WKUserContentController> _userContentController;
    3839    RetainPtr<_WKVisitedLinkProvider> _visitedLinkProvider;
    3940    WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
    … …  
    5556    configuration.processPool = _processPool.get();
    5657    configuration.preferences = _preferences.get();
     58    configuration._userContentController = _userContentController.get();
    5759    configuration._visitedLinkProvider = _visitedLinkProvider.get();
    5860    configuration._relatedWebView = _relatedWebView.get().get();
    … …  
    8284{
    8385    _preferences = preferences;
     86}
     87
     88- (_WKUserContentController *)_userContentController
     89{
     90    return _userContentController.get();
     91}
     92
     93- (void)_setUserContentController:(_WKUserContentController *)userContentController
     94{
     95    _userContentController = userContentController;
    8496}
    8597

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h

    r165565 r166598  
    3030@class WKWebView;
    3131@class _WKVisitedLinkProvider;
     32@class _WKUserContentController;
    3233
    3334@interface WKWebViewConfiguration (WKPrivate)
    … …  
    3637@property (nonatomic, copy, setter=_setGroupIdentifier:) NSString *_groupIdentifier;
    3738
     39@property (nonatomic, strong, setter=_setUserContentController:) _WKUserContentController *_userContentController;
     40
    3841@property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider;
    3942

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

    r166379 r166598  
    4343@class WKBrowsingContextHandle;
    4444@class _WKRemoteObjectRegistry;
     45
    4546@protocol WKHistoryDelegatePrivate;
     47@protocol _WKScriptMessageHandler;
    4648
    4749@interface WKWebView (WKPrivate)

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.h

    r166597 r166598  
    2929#if WK_API_ENABLED
    3030
     31@class WKWebView;
     32@class _WKScriptWorld;
     33
    3134WK_API_CLASS
    32 @interface _WKScriptWorld : NSObject
     35@interface _WKScriptMessage : NSObject
    3336
    34 +(instancetype)defaultWorld;
     37@property (nonatomic, readonly) id body;
     38
     39@property (nonatomic, readonly, weak) WKWebView *webView;
     40@property (nonatomic, readonly) NSString *name;
     41@property (nonatomic, readonly) _WKScriptWorld *scriptWorld;
     42
     43// FIXME: Consider adding the navigation as well.
    3544
    3645@end
    3746
    3847#endif
     48

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.mm

    r166597 r166598  
    2424 */
    2525
    26 #import <Foundation/Foundation.h>
    27 #import <WebKit2/WKFoundation.h>
     26#import "config.h"
     27#import "_WKScriptMessage.h"
    2828
    2929#if WK_API_ENABLED
    3030
    31 WK_API_CLASS
    32 @interface _WKScriptWorld : NSObject
     31@implementation _WKScriptMessage
    3332
    34 +(instancetype)defaultWorld;
     33- (id)body
     34{
     35    // FIXME: Implement.
     36    return nil;
     37}
     38
     39- (WKWebView *)webView
     40{
     41    // FIXME: Implement.
     42    return nil;
     43}
     44
     45- (NSString *)name
     46{
     47    // FIXME: Implement.
     48    return nil;
     49}
     50
     51- (_WKScriptWorld *)scriptWorld
     52{
     53    return nil;
     54}
    3555
    3656@end
    3757
    3858#endif
     59

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessageHandler.h

    r166597 r166598  
    2424 */
    2525
    26 #import <Foundation/Foundation.h>
    2726#import <WebKit2/WKFoundation.h>
    2827
    2928#if WK_API_ENABLED
    3029
    31 WK_API_CLASS
    32 @interface _WKScriptWorld : NSObject
     30#import <Foundation/Foundation.h>
    3331
    34 +(instancetype)defaultWorld;
     32@class _WKScriptMessage;
     33@class _WKUserContentController;
     34
     35@protocol _WKScriptMessageHandler <NSObject>
     36
     37@required
     38
     39- (void)_userContentController:(_WKUserContentController *)userContentController didReceiveScriptMessage:(_WKScriptMessage *)message;
    3540
    3641@end
    3742
    3843#endif
     44
     45
     46

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h

    r166340 r166598  
    3232@interface _WKScriptWorld : NSObject
    3333
    34 +(instancetype)defaultWorld;
     34+ (instancetype)defaultWorld;
    3535
    3636@end

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.h

    r166597 r166598  
    2929#if WK_API_ENABLED
    3030
     31@class _WKScriptWorld;
     32@protocol _WKScriptMessageHandler;
     33
    3134WK_API_CLASS
    32 @interface _WKScriptWorld : NSObject
     35@interface _WKUserContentController : NSObject
    3336
    34 +(instancetype)defaultWorld;
     37- (void)addScriptMessageHandler:(id <_WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(_WKScriptWorld *)world;
     38- (void)removeScriptMessageHandlerForName:(NSString *)name world:(_WKScriptWorld *)world;
    3539
    3640@end
    3741
    3842#endif
     43
     44

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.mm

    r166597 r166598  
    2424 */
    2525
    26 #import <Foundation/Foundation.h>
    27 #import <WebKit2/WKFoundation.h>
     26#include "config.h"
     27#include "_WKUserContentController.h"
    2828
    2929#if WK_API_ENABLED
    3030
    31 WK_API_CLASS
    32 @interface _WKScriptWorld : NSObject
     31@implementation _WKUserContentController
    3332
    34 +(instancetype)defaultWorld;
     33- (void)addScriptMessageHandler:(id <_WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(_WKScriptWorld *)world
     34{
     35    // FIXME: Implement.
     36}
     37
     38- (void)removeScriptMessageHandlerForName:(NSString *)name world:(_WKScriptWorld *)world
     39{
     40    // FIXME: Implement.
     41}
    3542
    3643@end
    3744
    3845#endif
     46

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r166552 r166598  
    256256                1A7E376D18E3CA57003D0FFF /* _WKScriptWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */; };
    257257                1A7E376E18E3CA57003D0FFF /* _WKScriptWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */; settings = {ATTRIBUTES = (Private, ); }; };
     258                1A7E377518E4A33A003D0FFF /* _WKScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377418E4A33A003D0FFF /* _WKScriptMessageHandler.h */; };
     259                1A7E377818E4A4FE003D0FFF /* _WKScriptMessage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E377618E4A4FE003D0FFF /* _WKScriptMessage.mm */; };
     260                1A7E377918E4A4FE003D0FFF /* _WKScriptMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377718E4A4FE003D0FFF /* _WKScriptMessage.h */; };
    258261                1A81B38018BD66AD0007FDAC /* _WKVisitedLinkProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */; };
    259262                1A81B38118BD66AD0007FDAC /* _WKVisitedLinkProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    423426                1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4CEED18BC481800BC2D34 /* VisitedLinkTableController.cpp */; };
    424427                1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4CEEE18BC481800BC2D34 /* VisitedLinkTableController.h */; };
     428                1AFA3AC818E61C61003CCBAE /* _WKUserContentController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA3AC618E61C61003CCBAE /* _WKUserContentController.mm */; };
     429                1AFA3AC918E61C61003CCBAE /* _WKUserContentController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFA3AC718E61C61003CCBAE /* _WKUserContentController.h */; };
    425430                1AFDD3151891B54000153970 /* APIPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3141891B54000153970 /* APIPolicyClient.h */; };
    426431                1AFDD3171891C94700153970 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3161891C94700153970 /* WKPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
    … …  
    20152020                1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKScriptWorld.mm; sourceTree = "<group>"; };
    20162021                1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKScriptWorld.h; sourceTree = "<group>"; };
     2022                1A7E377418E4A33A003D0FFF /* _WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKScriptMessageHandler.h; sourceTree = "<group>"; };
     2023                1A7E377618E4A4FE003D0FFF /* _WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKScriptMessage.mm; sourceTree = "<group>"; };
     2024                1A7E377718E4A4FE003D0FFF /* _WKScriptMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKScriptMessage.h; sourceTree = "<group>"; };
    20172025                1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkProvider.mm; sourceTree = "<group>"; };
    20182026                1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkProvider.h; sourceTree = "<group>"; };
    … …  
    21982206                1AF4CEED18BC481800BC2D34 /* VisitedLinkTableController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkTableController.cpp; sourceTree = "<group>"; };
    21992207                1AF4CEEE18BC481800BC2D34 /* VisitedLinkTableController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkTableController.h; sourceTree = "<group>"; };
     2208                1AFA3AC618E61C61003CCBAE /* _WKUserContentController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKUserContentController.mm; sourceTree = "<group>"; };
     2209                1AFA3AC718E61C61003CCBAE /* _WKUserContentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentController.h; sourceTree = "<group>"; };
    22002210                1AFDD3141891B54000153970 /* APIPolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIPolicyClient.h; sourceTree = "<group>"; };
    22012211                1AFDD3161891C94700153970 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
    … …  
    46314641                                1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */,
    46324642                                1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */,
     4643                                1A7E377718E4A4FE003D0FFF /* _WKScriptMessage.h */,
     4644                                1A7E377618E4A4FE003D0FFF /* _WKScriptMessage.mm */,
     4645                                1A7E377418E4A33A003D0FFF /* _WKScriptMessageHandler.h */,
     4646                                1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */,
     4647                                1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */,
     4648                                2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */,
     4649                                2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
     4650                                2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */,
     4651                                1AFA3AC718E61C61003CCBAE /* _WKUserContentController.h */,
     4652                                1AFA3AC618E61C61003CCBAE /* _WKUserContentController.mm */,
    46334653                                1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */,
    46344654                                1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */,
    46354655                                1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */,
    4636                                 2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */,
    4637                                 2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
    4638                                 2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */,
    46394656                                1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
    46404657                                1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */,
    … …  
    46614678                                1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */,
    46624679                                1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */,
    4663                                 1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */,
    4664                                 1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */,
    46654680                                1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */,
    46664681                                3743925718BC4C60001C8675 /* WKUIDelegatePrivate.h */,
    … …  
    66126627                                BC017D0D16260FF4007054F5 /* WKDOMNode.h in Headers */,
    66136628                                BC39C4361626366F008BC689 /* WKDOMRange.h in Headers */,
     6629                                1A7E377518E4A33A003D0FFF /* _WKScriptMessageHandler.h in Headers */,
    66146630                                293EBEAB1627D9C9005F89F1 /* WKDOMText.h in Headers */,
    66156631                                BC017D2116263308007054F5 /* WKDOMTextIterator.h in Headers */,
    … …  
    68756891                                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */,
    68766892                                1A8E7D3D18C15149005A702A /* VisitedLinkTableControllerMessages.h in Headers */,
     6893                                1A7E377918E4A4FE003D0FFF /* _WKScriptMessage.h in Headers */,
    68776894                                1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
    68786895                                1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */,
    … …  
    69927009                                BC1BE1E012D54A410004A228 /* WebGeolocationClient.h in Headers */,
    69937010                                BC0E5FE512D697160012A72A /* WebGeolocationManager.h in Headers */,
     7011                                1AFA3AC918E61C61003CCBAE /* _WKUserContentController.h in Headers */,
    69947012                                BC0E606212D6BA910012A72A /* WebGeolocationManagerMessages.h in Headers */,
    69957013                                BC54CACB12D64291005C67B0 /* WebGeolocationManagerProxy.h in Headers */,
    … …  
    82548272                                1A2D90D31281C966001EB962 /* PluginProcessCreationParameters.cpp in Sources */,
    82558273                                1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */,
     8274                                1A7E377818E4A4FE003D0FFF /* _WKScriptMessage.mm in Sources */,
    82568275                                BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */,
    82578276                                2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */,
    … …  
    84058424                                BC575613126E0138006F0F12 /* APIError.cpp in Sources */,
    84068425                                BC111AE0112F5BC200337BAB /* WebErrorsMac.mm in Sources */,
     8426                                1AFA3AC818E61C61003CCBAE /* _WKUserContentController.mm in Sources */,
    84078427                                C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
    84088428                                BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.