Changeset 165398 in webkit

Timestamp:

Mar 10, 2014, 1:19:06 PM (11 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/16278716> [Cocoa] Allow setting a custom group identifier on a WKWebView
​https://bugs.webkit.org/show_bug.cgi?id=130033

Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView initWithFrame:configuration:]): Create a page group with the group identifier
from the configuration, if it’s non-empty.

• UIProcess/API/Cocoa/WKWebViewConfiguration.mm:

(-[WKWebViewConfiguration _groupIdentifier]): Added this accessor.
(-[WKWebViewConfiguration _setGroupIdentifier:]): Ditto.

• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Declared _groupIdentifier property.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (3 diffs)
• UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-10  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/16278716> [Cocoa] Allow setting a custom group identifier on a WKWebView
+        https://bugs.webkit.org/show_bug.cgi?id=130033
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView initWithFrame:configuration:]): Create a page group with the group identifier
+        from the configuration, if it’s non-empty.
+        * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+        (-[WKWebViewConfiguration _groupIdentifier]): Added this accessor.
+        (-[WKWebViewConfiguration _setGroupIdentifier:]): Ditto.
+        * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Declared _groupIdentifier property.
+
 2014-03-10  Enrica Casucci  <enrica@apple.com>
 

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

@@ -52 +52 @@
 #import "WebContext.h"
 #import "WebBackForwardList.h"
+#import "WebPageGroup.h"
 #import "WebPageProxy.h"
 #import "WebProcessProxy.h"
@@ -152 +153 @@
 
     webPageConfiguration.visitedLinkProvider = [_configuration visitedLinkProvider]->_visitedLinkProvider.get();
+
+    RefPtr<WebKit::WebPageGroup> pageGroup;
+    NSString *groupIdentifier = configuration._groupIdentifier;
+    if (groupIdentifier.length) {
+        pageGroup = WebKit::WebPageGroup::create(configuration._groupIdentifier);
+        webPageConfiguration.pageGroup = pageGroup.get();
+    }
 
 #if PLATFORM(IOS)

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

@@ -38 +38 @@
     RetainPtr<WKVisitedLinkProvider> _visitedLinkProvider;
     WebKit::WeakObjCPtr<WKWebView> _relatedWebView;
+    RetainPtr<NSString> _groupIdentifier;
 #if PLATFORM(IOS)
     RetainPtr<WKWebViewContentProviderRegistry> _contentProviderRegistry;
@@ -92 +93 @@
 }
 
-- (WKWebView *)_relatedWebView
-{
-    return _relatedWebView.getAutoreleased();
-}
-
-- (void)_setRelatedWebView:(WKWebView *)relatedWebView
-{
-    _relatedWebView = relatedWebView;
-}
-
 #if PLATFORM(IOS)
 - (WKWebViewContentProviderRegistry *)_contentProviderRegistry
@@ -116 +107 @@
 @end
 
+@implementation WKWebViewConfiguration (WKPrivate)
+
+- (WKWebView *)_relatedWebView
+{
+    return _relatedWebView.getAutoreleased();
+}
+
+- (void)_setRelatedWebView:(WKWebView *)relatedWebView
+{
+    _relatedWebView = relatedWebView;
+}
+
+- (NSString *)_groupIdentifier
+{
+    return _groupIdentifier.get();
+}
+
+- (void)_setGroupIdentifier:(NSString *)groupIdentifier
+{
+    _groupIdentifier = groupIdentifier;
+}
+
+@end
+
 #endif // WK_API_ENABLED

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

@@ -33 +33 @@
 
 @property (nonatomic, weak, setter=_setRelatedWebView:) WKWebView *_relatedWebView;
+@property (nonatomic, copy, setter=_setGroupIdentifier:) NSString *_groupIdentifier;
 
 @end