[WebKit2] Promote user script SPI to API
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Apr 2014 21:36:32 +0000 (21:36 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 3 Apr 2014 21:36:32 +0000 (21:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=131181

Reviewed by Anders Carlsson.

Source/WebKit/mac:

* MigrateHeaders.make:

Source/WebKit2:

* UIProcess/API/Cocoa/WKScriptMessage.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.h.
* UIProcess/API/Cocoa/WKScriptMessage.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.mm.
(-[WKScriptMessage scriptWorld]):
(-[_WKScriptMessage scriptWorld]): Deleted.
* UIProcess/API/Cocoa/WKScriptMessageHandler.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessageHandler.h.
* UIProcess/API/Cocoa/WKScriptWorld.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
* UIProcess/API/Cocoa/WKScriptWorld.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm.
(+[WKScriptWorld defaultWorld]):
(+[_WKScriptWorld defaultWorld]): Deleted.
* UIProcess/API/Cocoa/WKUserContentController.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.h.
* UIProcess/API/Cocoa/WKUserContentController.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.mm.
(-[WKUserContentController addScriptMessageHandler:name:world:]):
(-[WKUserContentController removeScriptMessageHandlerForName:world:]):
(-[_WKUserContentController addScriptMessageHandler:name:world:]): Deleted.
(-[_WKUserContentController removeScriptMessageHandlerForName:world:]): Deleted.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.h:
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration userContentController]):
(-[WKWebViewConfiguration setUserContentController:]):
(-[WKWebViewConfiguration _userContentController]): Deleted.
(-[WKWebViewConfiguration _setUserContentController:]): Deleted.
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* UIProcess/API/Cocoa/WKWebViewPrivate.h:
* UIProcess/API/Cocoa/_WKScriptMessage.h: Removed.
* UIProcess/API/Cocoa/_WKScriptMessage.mm: Removed.
* UIProcess/API/Cocoa/_WKScriptMessageHandler.h: Removed.
* UIProcess/API/Cocoa/_WKScriptWorld.h: Removed.
* UIProcess/API/Cocoa/_WKScriptWorld.mm: Removed.
* UIProcess/API/Cocoa/_WKUserContentController.h: Removed.
* UIProcess/API/Cocoa/_WKUserContentController.mm: Removed.
* WebKit2.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@166744 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/MigrateHeaders.make
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h [moved from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.h with 93% similarity]
Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm [moved from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.mm with 94% similarity]
Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h [moved from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessageHandler.h with 86% similarity]
Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h [moved from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h with 97% similarity]
Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm [moved from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm with 91% similarity]
Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h [moved from Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.h with 85% similarity]
Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm [moved from Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.mm with 86% similarity]
Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

index 8ad1ba3fa23e14fd458fe721e9c7678fc32011f4..b05196e6963176f832b2315ea357aeebc82b74d6 100644 (file)
@@ -1,3 +1,12 @@
+2014-04-03  Sam Weinig  <sam@webkit.org>
+
+        [WebKit2] Promote user script SPI to API
+        https://bugs.webkit.org/show_bug.cgi?id=131181
+
+        Reviewed by Anders Carlsson.
+
+        * MigrateHeaders.make:
+
 2014-04-02  Benjamin Poulain  <bpoulain@apple.com>
 
         [iOS] Remove the legacy string drawing code
index 77d88c7c36017a334dbc2515ce4da2a8dd062944..e9b3104011bb8e9eea43a9384bb52467f2b89080 100644 (file)
@@ -274,8 +274,12 @@ WEBKIT2_HEADERS = \
     WKPreferences.h \
     WKProcessPool.h \
     WKProcessPoolPrivate.h \
+    WKScriptMessage.h \
+    WKScriptMessageHandler.h \
+    WKScriptWorld.h \
     WKUIDelegate.h \
     WKUIDelegatePrivate.h \
+    WKUserContentController.h \
     WKWebView.h \
     WKWebViewConfiguration.h \
     WKWebViewConfigurationPrivate.h \
index faa0155db5ac1c7a569aeebece3285d93079c4c8..bf0711be379d2539731f3bc325e9617d6e08c713 100644 (file)
@@ -1,3 +1,45 @@
+2014-04-03  Sam Weinig  <sam@webkit.org>
+
+        [WebKit2] Promote user script SPI to API
+        https://bugs.webkit.org/show_bug.cgi?id=131181
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/API/Cocoa/WKScriptMessage.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.h.
+        * UIProcess/API/Cocoa/WKScriptMessage.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.mm.
+        (-[WKScriptMessage scriptWorld]):
+        (-[_WKScriptMessage scriptWorld]): Deleted.
+        * UIProcess/API/Cocoa/WKScriptMessageHandler.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessageHandler.h.
+        * UIProcess/API/Cocoa/WKScriptWorld.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h.
+        * UIProcess/API/Cocoa/WKScriptWorld.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm.
+        (+[WKScriptWorld defaultWorld]):
+        (+[_WKScriptWorld defaultWorld]): Deleted.
+        * UIProcess/API/Cocoa/WKUserContentController.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.h.
+        * UIProcess/API/Cocoa/WKUserContentController.mm: Copied from Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.mm.
+        (-[WKUserContentController addScriptMessageHandler:name:world:]):
+        (-[WKUserContentController removeScriptMessageHandlerForName:world:]):
+        (-[_WKUserContentController addScriptMessageHandler:name:world:]): Deleted.
+        (-[_WKUserContentController removeScriptMessageHandlerForName:world:]): Deleted.
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView initWithFrame:configuration:]):
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration copyWithZone:]):
+        (-[WKWebViewConfiguration userContentController]):
+        (-[WKWebViewConfiguration setUserContentController:]):
+        (-[WKWebViewConfiguration _userContentController]): Deleted.
+        (-[WKWebViewConfiguration _setUserContentController:]): Deleted.
+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+        * UIProcess/API/Cocoa/_WKScriptMessage.h: Removed.
+        * UIProcess/API/Cocoa/_WKScriptMessage.mm: Removed.
+        * UIProcess/API/Cocoa/_WKScriptMessageHandler.h: Removed.
+        * UIProcess/API/Cocoa/_WKScriptWorld.h: Removed.
+        * UIProcess/API/Cocoa/_WKScriptWorld.mm: Removed.
+        * UIProcess/API/Cocoa/_WKUserContentController.h: Removed.
+        * UIProcess/API/Cocoa/_WKUserContentController.mm: Removed.
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2014-04-03  Anders Carlsson  <andersca@apple.com>
 
         Make download policy decisions SPI for now
similarity index 93%
rename from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.h
rename to Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.h
index d9cc875a6c4b0ec12dfccd6849c2691797452080..e5968614dc87006f7180578ef0125fedd30e6666 100644 (file)
 #if WK_API_ENABLED
 
 @class WKWebView;
-@class _WKScriptWorld;
+@class WKScriptWorld;
 
 WK_API_CLASS
-@interface _WKScriptMessage : NSObject
+@interface WKScriptMessage : NSObject
 
 @property (nonatomic, readonly) id body;
 
 @property (nonatomic, readonly, weak) WKWebView *webView;
 @property (nonatomic, readonly) NSString *name;
-@property (nonatomic, readonly) _WKScriptWorld *scriptWorld;
+@property (nonatomic, readonly) WKScriptWorld *scriptWorld;
 
 // FIXME: Consider adding the navigation as well.
 
similarity index 94%
rename from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessage.mm
rename to Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessage.mm
index c178606b2950265257ff70eb967f114b88a4fff9..c4712dd2215ce156160b3a63283b5185317b6703 100644 (file)
  */
 
 #import "config.h"
-#import "_WKScriptMessage.h"
+#import "WKScriptMessage.h"
 
 #if WK_API_ENABLED
 
-@implementation _WKScriptMessage
+@implementation WKScriptMessage
 
 - (id)body
 {
@@ -48,7 +48,7 @@
     return nil;
 }
 
-- (_WKScriptWorld *)scriptWorld
+- (WKScriptWorld *)scriptWorld
 {
     return nil;
 }
similarity index 86%
rename from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptMessageHandler.h
rename to Source/WebKit2/UIProcess/API/Cocoa/WKScriptMessageHandler.h
index 1643018953dd3d797e06cb86f90bc6fd943a4c42..4594361af4a97c5f7de6adad86b75ee72faeefd8 100644 (file)
 
 #import <Foundation/Foundation.h>
 
-@class _WKScriptMessage;
-@class _WKUserContentController;
+@class WKScriptMessage;
+@class WKUserContentController;
 
-@protocol _WKScriptMessageHandler <NSObject>
+@protocol WKScriptMessageHandler <NSObject>
 
 @required
 
-- (void)_userContentController:(_WKUserContentController *)userContentController didReceiveScriptMessage:(_WKScriptMessage *)message;
+- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message;
 
 @end
 
similarity index 97%
rename from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.h
rename to Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.h
index a95dd050820d7b5779aa447f106e760ad62164ab..c1c4de3fb8f56fce2097751baa7359959417e3ed 100644 (file)
@@ -29,7 +29,7 @@
 #if WK_API_ENABLED
 
 WK_API_CLASS
-@interface _WKScriptWorld : NSObject
+@interface WKScriptWorld : NSObject
 
 + (instancetype)defaultWorld;
 
similarity index 91%
rename from Source/WebKit2/UIProcess/API/Cocoa/_WKScriptWorld.mm
rename to Source/WebKit2/UIProcess/API/Cocoa/WKScriptWorld.mm
index f35212f3ee45c71198c35355f63c04c5ad70a5f7..6761c9d045e6b7c693c389864370cd76d768b4f2 100644 (file)
  */
 
 #import "config.h"
-#import "_WKScriptWorld.h"
+#import "WKScriptWorld.h"
 
 #if WK_API_ENABLED
 
-@implementation _WKScriptWorld {
+@implementation WKScriptWorld {
     uint64_t _worldID;
 }
 
@@ -42,10 +42,10 @@ static uint64_t generateWorldID()
 + (instancetype)defaultWorld
 {
     static dispatch_once_t onceToken;
-    static _WKScriptWorld *defaultWorld;
+    static WKScriptWorld *defaultWorld;
 
     dispatch_once(&onceToken, ^{
-        defaultWorld = [[_WKScriptWorld alloc] _initWithWorldID:0];
+        defaultWorld = [[WKScriptWorld alloc] _initWithWorldID:0];
     });
 
     return defaultWorld;
similarity index 85%
rename from Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.h
rename to Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h
index 5ab6288a5e443bf2890efb3731943a8564642771..7251212fed8d9ea343161fc9b9a6969fa8af7a36 100644 (file)
 
 #if WK_API_ENABLED
 
-@class _WKScriptWorld;
-@protocol _WKScriptMessageHandler;
+@class WKScriptWorld;
+@protocol WKScriptMessageHandler;
 
 WK_API_CLASS
-@interface _WKUserContentController : NSObject
+@interface WKUserContentController : NSObject
 
-- (void)addScriptMessageHandler:(id <_WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(_WKScriptWorld *)world;
-- (void)removeScriptMessageHandlerForName:(NSString *)name world:(_WKScriptWorld *)world;
+- (void)addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(WKScriptWorld *)world;
+- (void)removeScriptMessageHandlerForName:(NSString *)name world:(WKScriptWorld *)world;
 
 @end
 
similarity index 86%
rename from Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentController.mm
rename to Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm
index c2df02e5ecaa59e73f9ee3cafd3db9df4ec5613f..e24aaac61c5e46c1156bd750e02d74e51d632fd8 100644 (file)
  */
 
 #include "config.h"
-#include "_WKUserContentController.h"
+#include "WKUserContentController.h"
 
 #if WK_API_ENABLED
 
-@implementation _WKUserContentController
+@implementation WKUserContentController
 
-- (void)addScriptMessageHandler:(id <_WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(_WKScriptWorld *)world
+- (void)addScriptMessageHandler:(id <WKScriptMessageHandler>)scriptMessageHandler name:(NSString *)name world:(WKScriptWorld *)world
 {
     // FIXME: Implement.
 }
 
-- (void)removeScriptMessageHandlerForName:(NSString *)name world:(_WKScriptWorld *)world
+- (void)removeScriptMessageHandlerForName:(NSString *)name world:(WKScriptWorld *)world
 {
     // FIXME: Implement.
 }
index c5b061fa8267d4edc05966e797bde832c508d9ae..fabb06e13e352f8126bfd67b4915598b9b0747e6 100644 (file)
@@ -46,6 +46,7 @@
 #import "WKPreferencesInternal.h"
 #import "WKProcessPoolInternal.h"
 #import "WKUIDelegate.h"
+#import "WKUserContentController.h"
 #import "WKWebViewConfigurationInternal.h"
 #import "WKWebViewContentProvider.h"
 #import "WebBackForwardList.h"
@@ -56,7 +57,6 @@
 #import "WebProcessProxy.h"
 #import "_WKFindDelegate.h"
 #import "_WKRemoteObjectRegistryInternal.h"
-#import "_WKUserContentController.h"
 #import "_WKVisitedLinkProviderInternal.h"
 #import <wtf/RetainPtr.h>
 
     if (![_configuration preferences])
         [_configuration setPreferences:adoptNS([[WKPreferences alloc] init]).get()];
 
-    if (![_configuration _userContentController])
-        [_configuration _setUserContentController:adoptNS([[_WKUserContentController alloc] init]).get()];
+    if (![_configuration userContentController])
+        [_configuration setUserContentController:adoptNS([[WKUserContentController alloc] init]).get()];
 
     if (![_configuration _visitedLinkProvider])
         [_configuration _setVisitedLinkProvider:adoptNS([[_WKVisitedLinkProvider alloc] init]).get()];
index 8fcecb286da6e56e80c868a34c3cfc199f543bed..3fb05cc70560bed24f22c6889e8272f310f7a3c2 100644 (file)
@@ -30,6 +30,7 @@
 
 @class WKPreferences;
 @class WKProcessPool;
+@class WKUserContentController;
 
 /*! A @link WKWebViewConfiguration @/link is a collection of properties used to initialize a web
  view.
@@ -53,6 +54,13 @@ WK_API_CLASS
 */
 @property (nonatomic, strong) WKPreferences *preferences;
 
+
+/*! @abstract The user content controller that should be used by web views created with this configuration.
+ @discussion When this property is set to nil, a unique user content controller object will be created for each
+ @link WKWebView @/link initialized with the configuration.
+*/
+@property (nonatomic, strong) WKUserContentController *userContentController;
+
 @end
 
 #endif
index 0e3456915d3b7c419d6227b65b646a3117b4d61c..033bd8ed36621feb3ff5a9a1710a04e2f302d8d7 100644 (file)
@@ -28,6 +28,7 @@
 
 #if WK_API_ENABLED
 
+#import "WKUserContentController.h"
 #import "WKWebViewContentProviderRegistry.h"
 #import "WeakObjCPtr.h"
 #import <wtf/RetainPtr.h>
@@ -35,7 +36,7 @@
 @implementation WKWebViewConfiguration {
     RetainPtr<WKProcessPool> _processPool;
     RetainPtr<WKPreferences> _preferences;
-    RetainPtr<_WKUserContentController> _userContentController;
+    RetainPtr<WKUserContentController> _userContentController;
     RetainPtr<_WKVisitedLinkProvider> _visitedLinkProvider;
     WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
     RetainPtr<NSString> _groupIdentifier;
@@ -55,7 +56,7 @@
 
     configuration.processPool = _processPool.get();
     configuration.preferences = _preferences.get();
-    configuration._userContentController = _userContentController.get();
+    configuration.userContentController = _userContentController.get();
     configuration._visitedLinkProvider = _visitedLinkProvider.get();
     configuration._relatedWebView = _relatedWebView.get().get();
 #if PLATFORM(IOS)
     _preferences = preferences;
 }
 
-- (_WKUserContentController *)_userContentController
+- (WKUserContentController *)userContentController
 {
     return _userContentController.get();
 }
 
-- (void)_setUserContentController:(_WKUserContentController *)userContentController
+- (void)setUserContentController:(WKUserContentController *)userContentController
 {
     _userContentController = userContentController;
 }
index 28f46cfce1ee3b6efdabf689f127144bc01ec022..e5db3ff39ad6b46ffe6b611d403b090905c653df 100644 (file)
 
 @class WKWebView;
 @class _WKVisitedLinkProvider;
-@class _WKUserContentController;
 
 @interface WKWebViewConfiguration (WKPrivate)
 
 @property (nonatomic, weak, setter=_setRelatedWebView:) WKWebView *_relatedWebView;
 @property (nonatomic, copy, setter=_setGroupIdentifier:) NSString *_groupIdentifier;
 
-@property (nonatomic, strong, setter=_setUserContentController:) _WKUserContentController *_userContentController;
-
 @property (nonatomic, strong, setter=_setVisitedLinkProvider:) _WKVisitedLinkProvider *_visitedLinkProvider;
 
 @end
index 5e306075ba77d27a79f27bcfa2ebff6b4add2806..b12983603fd671a4911f4b108831684d61990fc9 100644 (file)
@@ -56,7 +56,6 @@ typedef NS_OPTIONS(NSUInteger, _WKFindOptions) {
 
 @protocol WKHistoryDelegatePrivate;
 @protocol _WKFindDelegate;
-@protocol _WKScriptMessageHandler;
 
 @interface WKWebView (WKPrivate)
 
index 29a5ad4393eb4668dc53cded33202440f9bf123c..abc7af431656348b28e9494c0fdae47c845f0c6d 100644 (file)
                1A79D9F218EB5EF100914CC5 /* WKBackForwardListPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1A7C6CDA1378950800B9C04D /* EnvironmentVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */; };
                1A7C6CDB1378950800B9C04D /* EnvironmentVariables.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */; };
-               1A7E376D18E3CA57003D0FFF /* _WKScriptWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */; };
-               1A7E376E18E3CA57003D0FFF /* _WKScriptWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               1A7E377518E4A33A003D0FFF /* _WKScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377418E4A33A003D0FFF /* _WKScriptMessageHandler.h */; };
-               1A7E377818E4A4FE003D0FFF /* _WKScriptMessage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E377618E4A4FE003D0FFF /* _WKScriptMessage.mm */; };
-               1A7E377918E4A4FE003D0FFF /* _WKScriptMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377718E4A4FE003D0FFF /* _WKScriptMessage.h */; };
+               1A7E376D18E3CA57003D0FFF /* WKScriptWorld.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E376B18E3CA57003D0FFF /* WKScriptWorld.mm */; };
+               1A7E376E18E3CA57003D0FFF /* WKScriptWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E376C18E3CA57003D0FFF /* WKScriptWorld.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
+               1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */; };
+               1A7E377918E4A4FE003D0FFF /* WKScriptMessage.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1A81B38018BD66AD0007FDAC /* _WKVisitedLinkProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */; };
                1A81B38118BD66AD0007FDAC /* _WKVisitedLinkProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1A81B38518BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */; };
                1AF4129B18B40FCD00546FDC /* WKNavigationActionPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4129A18B40FCD00546FDC /* WKNavigationActionPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                1AF4CEEF18BC481800BC2D34 /* VisitedLinkTableController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AF4CEED18BC481800BC2D34 /* VisitedLinkTableController.cpp */; };
                1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AF4CEEE18BC481800BC2D34 /* VisitedLinkTableController.h */; };
-               1AFA3AC818E61C61003CCBAE /* _WKUserContentController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA3AC618E61C61003CCBAE /* _WKUserContentController.mm */; };
-               1AFA3AC918E61C61003CCBAE /* _WKUserContentController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFA3AC718E61C61003CCBAE /* _WKUserContentController.h */; };
+               1AFA3AC818E61C61003CCBAE /* WKUserContentController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFA3AC618E61C61003CCBAE /* WKUserContentController.mm */; };
+               1AFA3AC918E61C61003CCBAE /* WKUserContentController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFA3AC718E61C61003CCBAE /* WKUserContentController.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1AFDD3151891B54000153970 /* APIPolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3141891B54000153970 /* APIPolicyClient.h */; };
                1AFDD3171891C94700153970 /* WKPreferences.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AFDD3161891C94700153970 /* WKPreferences.h */; settings = {ATTRIBUTES = (Public, ); }; };
                1AFDD3191891CA1200153970 /* WKPreferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFDD3181891CA1200153970 /* WKPreferences.mm */; };
                1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBackForwardListPrivate.h; sourceTree = "<group>"; };
                1A7C6CD81378950800B9C04D /* EnvironmentVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnvironmentVariables.cpp; sourceTree = "<group>"; };
                1A7C6CD91378950800B9C04D /* EnvironmentVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnvironmentVariables.h; sourceTree = "<group>"; };
-               1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKScriptWorld.mm; sourceTree = "<group>"; };
-               1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKScriptWorld.h; sourceTree = "<group>"; };
-               1A7E377418E4A33A003D0FFF /* _WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKScriptMessageHandler.h; sourceTree = "<group>"; };
-               1A7E377618E4A4FE003D0FFF /* _WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKScriptMessage.mm; sourceTree = "<group>"; };
-               1A7E377718E4A4FE003D0FFF /* _WKScriptMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKScriptMessage.h; sourceTree = "<group>"; };
+               1A7E376B18E3CA57003D0FFF /* WKScriptWorld.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptWorld.mm; sourceTree = "<group>"; };
+               1A7E376C18E3CA57003D0FFF /* WKScriptWorld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptWorld.h; sourceTree = "<group>"; };
+               1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessageHandler.h; sourceTree = "<group>"; };
+               1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKScriptMessage.mm; sourceTree = "<group>"; };
+               1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKScriptMessage.h; sourceTree = "<group>"; };
                1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKVisitedLinkProvider.mm; sourceTree = "<group>"; };
                1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkProvider.h; sourceTree = "<group>"; };
                1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKVisitedLinkProviderInternal.h; sourceTree = "<group>"; };
                1AF4129A18B40FCD00546FDC /* WKNavigationActionPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationActionPrivate.h; sourceTree = "<group>"; };
                1AF4CEED18BC481800BC2D34 /* VisitedLinkTableController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VisitedLinkTableController.cpp; sourceTree = "<group>"; };
                1AF4CEEE18BC481800BC2D34 /* VisitedLinkTableController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VisitedLinkTableController.h; sourceTree = "<group>"; };
-               1AFA3AC618E61C61003CCBAE /* _WKUserContentController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKUserContentController.mm; sourceTree = "<group>"; };
-               1AFA3AC718E61C61003CCBAE /* _WKUserContentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKUserContentController.h; sourceTree = "<group>"; };
+               1AFA3AC618E61C61003CCBAE /* WKUserContentController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKUserContentController.mm; sourceTree = "<group>"; };
+               1AFA3AC718E61C61003CCBAE /* WKUserContentController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentController.h; sourceTree = "<group>"; };
                1AFDD3141891B54000153970 /* APIPolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIPolicyClient.h; sourceTree = "<group>"; };
                1AFDD3161891C94700153970 /* WKPreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferences.h; sourceTree = "<group>"; };
                1AFDD3181891CA1200153970 /* WKPreferences.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKPreferences.mm; sourceTree = "<group>"; };
                37C4C08318149C2A003688B9 /* Cocoa */ = {
                        isa = PBXGroup;
                        children = (
-                               1A1B748918DA55FD00047E02 /* To Be Removed */,
                                1A43E826188F38E2009E4D30 /* Deprecated */,
+                               1A1B748918DA55FD00047E02 /* To Be Removed */,
                                37A5E01218BBF937000A081E /* _WKActivatedElementInfo.h */,
                                37A5E01118BBF937000A081E /* _WKActivatedElementInfo.mm */,
                                379A873518BBFA4300588AF2 /* _WKActivatedElementInfoInternal.h */,
                                A1A4FE5718DCE9FA00B5EA8A /* _WKDownload.h */,
                                A1A4FE5818DCE9FA00B5EA8A /* _WKDownload.mm */,
                                A1A4FE6018DD54A400B5EA8A /* _WKDownloadDelegate.h */,
-                               005D158E18E4C4EB00734619 /* _WKFindDelegate.h */,
                                A1A4FE5918DCE9FA00B5EA8A /* _WKDownloadInternal.h */,
                                379A873818BBFE0F00588AF2 /* _WKElementAction.h */,
                                379A873718BBFE0F00588AF2 /* _WKElementAction.mm */,
                                379A873B18BBFF0700588AF2 /* _WKElementActionInternal.h */,
+                               005D158E18E4C4EB00734619 /* _WKFindDelegate.h */,
                                1A43E828188F3CDC009E4D30 /* _WKProcessPoolConfiguration.h */,
                                1A43E827188F3CDC009E4D30 /* _WKProcessPoolConfiguration.mm */,
-                               1A7E377718E4A4FE003D0FFF /* _WKScriptMessage.h */,
-                               1A7E377618E4A4FE003D0FFF /* _WKScriptMessage.mm */,
-                               1A7E377418E4A33A003D0FFF /* _WKScriptMessageHandler.h */,
-                               1A7E376C18E3CA57003D0FFF /* _WKScriptWorld.h */,
-                               1A7E376B18E3CA57003D0FFF /* _WKScriptWorld.mm */,
                                2D6B371918A967AD0042AE80 /* _WKThumbnailView.h */,
-                               2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
                                2D6B371A18A967AD0042AE80 /* _WKThumbnailView.mm */,
-                               1AFA3AC718E61C61003CCBAE /* _WKUserContentController.h */,
-                               1AFA3AC618E61C61003CCBAE /* _WKUserContentController.mm */,
+                               2DACE64D18ADBFF000E4CA76 /* _WKThumbnailViewInternal.h */,
                                1A81B37F18BD66AD0007FDAC /* _WKVisitedLinkProvider.h */,
                                1A81B37E18BD66AD0007FDAC /* _WKVisitedLinkProvider.mm */,
                                1A81B38418BD673A0007FDAC /* _WKVisitedLinkProviderInternal.h */,
                                37C4C08B1814AC5C003688B9 /* WKBackForwardList.h */,
                                37C4C08A1814AC5C003688B9 /* WKBackForwardList.mm */,
                                37C4C08E1814AF3A003688B9 /* WKBackForwardListInternal.h */,
-                               1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */,
                                37C4C08518149C5B003688B9 /* WKBackForwardListItem.h */,
                                37C4C08418149C5B003688B9 /* WKBackForwardListItem.mm */,
                                37C4C08818149F23003688B9 /* WKBackForwardListItemInternal.h */,
+                               1A79D9F118EB5EF100914CC5 /* WKBackForwardListPrivate.h */,
                                1A4D664A18A3030E00D82E21 /* WKFrameInfo.h */,
                                1A4D664918A3030E00D82E21 /* WKFrameInfo.mm */,
                                1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */,
                                1A1B0EB718A424CD0038481A /* WKNavigationResponseInternal.h */,
                                1AFDD3161891C94700153970 /* WKPreferences.h */,
                                1AFDD3181891CA1200153970 /* WKPreferences.mm */,
-                               7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */,
                                1A3C887F18A5ABAE00C4C962 /* WKPreferencesInternal.h */,
+                               7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */,
                                1A158418189044F50017616C /* WKProcessPool.h */,
                                1A158417189044F50017616C /* WKProcessPool.mm */,
-                               1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */,
                                1A3CC16818907EB0001E6ED8 /* WKProcessPoolInternal.h */,
+                               1A6509CD18B4146200614332 /* WKProcessPoolPrivate.h */,
+                               1A7E377718E4A4FE003D0FFF /* WKScriptMessage.h */,
+                               1A7E377618E4A4FE003D0FFF /* WKScriptMessage.mm */,
+                               1A7E377418E4A33A003D0FFF /* WKScriptMessageHandler.h */,
+                               1A7E376C18E3CA57003D0FFF /* WKScriptWorld.h */,
+                               1A7E376B18E3CA57003D0FFF /* WKScriptWorld.mm */,
                                1AD8790918B6C38A006CAFD7 /* WKUIDelegate.h */,
                                3743925718BC4C60001C8675 /* WKUIDelegatePrivate.h */,
+                               1AFA3AC718E61C61003CCBAE /* WKUserContentController.h */,
+                               1AFA3AC618E61C61003CCBAE /* WKUserContentController.mm */,
                                1A3CC16518906ACF001E6ED8 /* WKWebView.h */,
                                1A3CC16418906ACF001E6ED8 /* WKWebView.mm */,
                                1ADF59191890528E0043C145 /* WKWebViewConfiguration.h */,
                                1ADF59181890528E0043C145 /* WKWebViewConfiguration.mm */,
-                               1AC1415018AC47EE006C602C /* WKWebViewConfigurationPrivate.h */,
                                2D7AAFD518C956AF00A7ACD4 /* WKWebViewConfigurationInternal.h */,
+                               1AC1415018AC47EE006C602C /* WKWebViewConfigurationPrivate.h */,
                                1A66BF8E18A052ED002071B4 /* WKWebViewInternal.h */,
                                26F9A83A18A3463F00AEB88A /* WKWebViewPrivate.h */,
                                1AD60F5C18E20F4C0020C034 /* WKWindowFeatures.h */,
                                0FCB4E6218BBE3D9000FCFC9 /* PageClientImpl.h in Headers */,
                                BC017D0D16260FF4007054F5 /* WKDOMNode.h in Headers */,
                                BC39C4361626366F008BC689 /* WKDOMRange.h in Headers */,
-                               1A7E377518E4A33A003D0FFF /* _WKScriptMessageHandler.h in Headers */,
+                               1A7E377518E4A33A003D0FFF /* WKScriptMessageHandler.h in Headers */,
                                293EBEAB1627D9C9005F89F1 /* WKDOMText.h in Headers */,
                                BC017D2116263308007054F5 /* WKDOMTextIterator.h in Headers */,
                                1A1B748B18DA576D00047E02 /* WKProcessPoolConfiguration.h in Headers */,
                                371B32DE184D67490013E2B2 /* WKNSURLProtectionSpace.h in Headers */,
                                2984F589164BA095004BC0C6 /* CustomProtocolManagerMessages.h in Headers */,
                                C5FA1ED318E1062200B3F402 /* WKAirPlayRoutePicker.h in Headers */,
-                               1A7E376E18E3CA57003D0FFF /* _WKScriptWorld.h in Headers */,
+                               1A7E376E18E3CA57003D0FFF /* WKScriptWorld.h in Headers */,
                                29AD3093164B4C5D0072DEA9 /* CustomProtocolManagerProxy.h in Headers */,
                                2984F57D164B915F004BC0C6 /* CustomProtocolManagerProxyMessages.h in Headers */,
                                518353DF1887128B00D9FE44 /* KeyedDecoder.h in Headers */,
                                1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */,
                                1A334DEE16DE8F88006A8E38 /* StorageAreaMapMessages.h in Headers */,
                                1A8E7D3D18C15149005A702A /* VisitedLinkTableControllerMessages.h in Headers */,
-                               1A7E377918E4A4FE003D0FFF /* _WKScriptMessage.h in Headers */,
+                               1A7E377918E4A4FE003D0FFF /* WKScriptMessage.h in Headers */,
                                1A44B95C16B73F9F00B7BBD8 /* StorageManager.h in Headers */,
                                1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */,
                                1AB31A9716BC688100F6DBC9 /* StorageManagerMessages.h in Headers */,
                                BC9B38A110F538BE00443A15 /* WebFrameProxy.h in Headers */,
                                BC1BE1E012D54A410004A228 /* WebGeolocationClient.h in Headers */,
                                BC0E5FE512D697160012A72A /* WebGeolocationManager.h in Headers */,
-                               1AFA3AC918E61C61003CCBAE /* _WKUserContentController.h in Headers */,
+                               1AFA3AC918E61C61003CCBAE /* WKUserContentController.h in Headers */,
                                BC0E606212D6BA910012A72A /* WebGeolocationManagerMessages.h in Headers */,
                                BC54CACB12D64291005C67B0 /* WebGeolocationManagerProxy.h in Headers */,
                                1F7D36C118DA513F00D9D659 /* APIDownloadClient.h in Headers */,
                                1A2BB6D014117B4D000F35D4 /* PluginProcessConnectionMessageReceiver.cpp in Sources */,
                                1A2D90D31281C966001EB962 /* PluginProcessCreationParameters.cpp in Sources */,
                                1AA4792312A59FD9008236C3 /* PluginProcessMac.mm in Sources */,
-                               1A7E377818E4A4FE003D0FFF /* _WKScriptMessage.mm in Sources */,
+                               1A7E377818E4A4FE003D0FFF /* WKScriptMessage.mm in Sources */,
                                BC82838C16B45F0700A278FE /* PluginProcessMain.mm in Sources */,
                                2DA9449E1884E4F000ED86DB /* NativeWebKeyboardEventIOS.mm in Sources */,
                                1A0EC604124A9F2C007EF4A5 /* PluginProcessManager.cpp in Sources */,
                                C5237F6012441CA300780472 /* WebEditorClientMac.mm in Sources */,
                                BC575613126E0138006F0F12 /* APIError.cpp in Sources */,
                                BC111AE0112F5BC200337BAB /* WebErrorsMac.mm in Sources */,
-                               1AFA3AC818E61C61003CCBAE /* _WKUserContentController.mm in Sources */,
+                               1AFA3AC818E61C61003CCBAE /* WKUserContentController.mm in Sources */,
                                C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
                                BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
                                BC111B5E112F629800337BAB /* WebEventFactory.mm in Sources */,
                                BC407628124FF0400068F20A /* WKCertificateInfoMac.mm in Sources */,
                                515E7727183DD6F60007203F /* AsyncRequest.cpp in Sources */,
                                BCA284D61492F2C7001F9042 /* WKConnection.mm in Sources */,
-                               1A7E376D18E3CA57003D0FFF /* _WKScriptWorld.mm in Sources */,
+                               1A7E376D18E3CA57003D0FFF /* WKScriptWorld.mm in Sources */,
                                0F0C365818C051BA00F607D7 /* RemoteLayerTreeHostIOS.mm in Sources */,
                                0F0C365C18C05CA100F607D7 /* RemoteScrollingCoordinatorProxyIOS.mm in Sources */,
                                BC4A6296147313A0006C681A /* WKConnectionRef.cpp in Sources */,