Changeset 163564 in webkit

Timestamp:

Feb 6, 2014 2:40:26 PM (10 years ago)

Author:

andersca@apple.com

Message:

Add a remoteObjectRegistry property to WKWebView
​https://bugs.webkit.org/show_bug.cgi?id=128331

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView resizeSubviewsWithOldSize:]):
(-[WKWebView _remoteObjectRegistry]):

• UIProcess/API/Cocoa/WKWebViewInternal.h:
• UIProcess/API/Cocoa/WKWebViewPrivate.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (5 diffs)
• UIProcess/API/Cocoa/WKWebViewInternal.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-06  Anders Carlsson  <andersca@apple.com>
+
+        Add a remoteObjectRegistry property to WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=128331
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView resizeSubviewsWithOldSize:]):
+        (-[WKWebView _remoteObjectRegistry]):
+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+
 2014-02-06  Anders Carlsson  <andersca@apple.com>
 

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

@@ -34 +34 @@
 #import "WKNavigationInternal.h"
 #import "WKProcessClass.h"
+#import "WKRemoteObjectRegistryInternal.h"
 #import "WKWebViewConfiguration.h"
 #import "WebBackForwardList.h"
@@ -51 +52 @@
     RetainPtr<WKWebViewConfiguration> _configuration;
     std::unique_ptr<WebKit::NavigationState> _navigationState;
+
+    RetainPtr<WKRemoteObjectRegistry> _remoteObjectRegistry;
 
 #if PLATFORM(IOS)
@@ -112 +115 @@
 }
 
+- (void)dealloc
+{
+    [_remoteObjectRegistry _invalidate];
+
+    [super dealloc];
+}
+
 - (WKWebViewConfiguration *)configuration
 {
@@ -309 +319 @@
 }
 
-#pragma mark Private API
+#pragma mark OS X-specific methods
+
+#if PLATFORM(MAC) && !PLATFORM(IOS)
+
+- (void)resizeSubviewsWithOldSize:(NSSize)oldSize
+{
+    [_wkView setFrame:self.bounds];
+}
+
+#endif
+
+@end
+
+@implementation WKWebView (WKPrivate)
+
+- (WKRemoteObjectRegistry *)_remoteObjectRegistry
+{
+    if (!_remoteObjectRegistry) {
+        _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithMessageSender:*_page]0;
+        _page->process().context().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID(), [_remoteObjectRegistry remoteObjectRegistry]);
+    }
+
+    return _remoteObjectRegistry.get();
+}
+
+#pragma mark iOS-specific methods
+
+#if PLATFORM(IOS)
 
 - (CGSize)_minimumLayoutSizeOverride
@@ -326 +363 @@
 #endif
 
-#pragma mark OS X-specific methods
-
-#if PLATFORM(MAC) && !PLATFORM(IOS)
-
-- (void)resizeSubviewsWithOldSize:(NSSize)oldSize
-{
-    [_wkView setFrame:self.bounds];
-}
-
 #endif
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h

@@ -24 +24 @@
  */
 
-#import "WKWebView.h"
+#import "WKWebViewPrivate.h"
 
 #if WK_API_ENABLED

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

@@ -28 +28 @@
 #if WK_API_ENABLED
 
+@class WKRemoteObjectRegistry;
+
 @interface WKWebView (WKPrivate)
+
+@property (nonatomic, readonly) WKRemoteObjectRegistry *_remoteObjectRegistry;
 
 #if TARGET_OS_IPHONE