Changeset 165398 in webkit
- Timestamp:
- Mar 10, 2014, 1:19:06 PM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r165397 r165398 1 2014-03-10 Dan Bernstein <mitz@apple.com> 2 3 <rdar://problem/16278716> [Cocoa] Allow setting a custom group identifier on a WKWebView 4 https://bugs.webkit.org/show_bug.cgi?id=130033 5 6 Reviewed by Tim Horton. 7 8 * UIProcess/API/Cocoa/WKWebView.mm: 9 (-[WKWebView initWithFrame:configuration:]): Create a page group with the group identifier 10 from the configuration, if it’s non-empty. 11 * UIProcess/API/Cocoa/WKWebViewConfiguration.mm: 12 (-[WKWebViewConfiguration _groupIdentifier]): Added this accessor. 13 (-[WKWebViewConfiguration _setGroupIdentifier:]): Ditto. 14 * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h: Declared _groupIdentifier property. 15 1 16 2014-03-10 Enrica Casucci <enrica@apple.com> 2 17 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm
r165303 r165398 52 52 #import "WebContext.h" 53 53 #import "WebBackForwardList.h" 54 #import "WebPageGroup.h" 54 55 #import "WebPageProxy.h" 55 56 #import "WebProcessProxy.h" … … 152 153 153 154 webPageConfiguration.visitedLinkProvider = [_configuration visitedLinkProvider]->_visitedLinkProvider.get(); 155 156 RefPtr<WebKit::WebPageGroup> pageGroup; 157 NSString *groupIdentifier = configuration._groupIdentifier; 158 if (groupIdentifier.length) { 159 pageGroup = WebKit::WebPageGroup::create(configuration._groupIdentifier); 160 webPageConfiguration.pageGroup = pageGroup.get(); 161 } 154 162 155 163 #if PLATFORM(IOS) -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
r165303 r165398 38 38 RetainPtr<WKVisitedLinkProvider> _visitedLinkProvider; 39 39 WebKit::WeakObjCPtr<WKWebView> _relatedWebView; 40 RetainPtr<NSString> _groupIdentifier; 40 41 #if PLATFORM(IOS) 41 42 RetainPtr<WKWebViewContentProviderRegistry> _contentProviderRegistry; … … 92 93 } 93 94 94 - (WKWebView *)_relatedWebView95 {96 return _relatedWebView.getAutoreleased();97 }98 99 - (void)_setRelatedWebView:(WKWebView *)relatedWebView100 {101 _relatedWebView = relatedWebView;102 }103 104 95 #if PLATFORM(IOS) 105 96 - (WKWebViewContentProviderRegistry *)_contentProviderRegistry … … 116 107 @end 117 108 109 @implementation WKWebViewConfiguration (WKPrivate) 110 111 - (WKWebView *)_relatedWebView 112 { 113 return _relatedWebView.getAutoreleased(); 114 } 115 116 - (void)_setRelatedWebView:(WKWebView *)relatedWebView 117 { 118 _relatedWebView = relatedWebView; 119 } 120 121 - (NSString *)_groupIdentifier 122 { 123 return _groupIdentifier.get(); 124 } 125 126 - (void)_setGroupIdentifier:(NSString *)groupIdentifier 127 { 128 _groupIdentifier = groupIdentifier; 129 } 130 131 @end 132 118 133 #endif // WK_API_ENABLED -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h
r164004 r165398 33 33 34 34 @property (nonatomic, weak, setter=_setRelatedWebView:) WKWebView *_relatedWebView; 35 @property (nonatomic, copy, setter=_setGroupIdentifier:) NSString *_groupIdentifier; 35 36 36 37 @end
Note:
See TracChangeset
for help on using the changeset viewer.