Changeset 162562 in webkit
- Timestamp:
- Jan 22, 2014 3:14:38 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 8 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r162556 r162562 1 2014-01-22 Anders Carlsson <andersca@apple.com> 2 3 WKProcessClass should create a WebContext 4 https://bugs.webkit.org/show_bug.cgi?id=127449 5 <rdar://problem/15885582> 6 7 Reviewed by Dan Bernstein. 8 9 * Shared/Cocoa/APIObject.mm: 10 (API::Object::newObject): 11 * UIProcess/API/Cocoa/WKBrowsingContextController.h: 12 * UIProcess/API/Cocoa/WKBrowsingContextController.mm: 13 * UIProcess/API/Cocoa/WKProcessClass.mm: 14 (-[WKProcessClass initWithConfiguration:]): 15 (-[WKProcessClass dealloc]): 16 (-[WKProcessClass API::]): 17 * UIProcess/API/Cocoa/WKProcessClassInternal.h: Renamed from Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroupInternal.h. 18 (WebKit::wrapper): 19 * UIProcess/API/Cocoa/WKProcessGroup.mm: 20 (-[WKProcessGroup initWithInjectedBundleURL:]): 21 * UIProcess/API/ios/WKContentView.mm: 22 (-[WKContentView _decidePolicyForGeolocationRequestFromOrigin:frame:request:]): 23 * WebKit2.xcodeproj/project.pbxproj: 24 1 25 2014-01-22 Tim Horton <timothy_horton@apple.com> 2 26 -
trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm
r160803 r162562 43 43 #import "WKNSURLProtectionSpace.h" 44 44 #import "WKNavigationDataInternal.h" 45 #import "WKProcess GroupInternal.h"45 #import "WKProcessClassInternal.h" 46 46 #import "WKWebProcessPlugInBrowserContextControllerInternal.h" 47 47 #import "WKWebProcessPlugInFrameInternal.h" … … 102 102 103 103 case Type::Context: 104 wrapper = [WKProcess Groupalloc];104 wrapper = [WKProcessClass alloc]; 105 105 break; 106 106 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.h
r162259 r162562 40 40 WK_API_CLASS 41 41 @interface WKBrowsingContextController : NSObject 42 43 @property (readonly) WKProcessGroup *processGroup;44 @property (readonly) WKBrowsingContextGroup *browsingContextGroup;45 42 46 43 #pragma mark Delegates -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm
r162259 r162562 48 48 #import "WKNSURLExtras.h" 49 49 #import "WKNSURLProtectionSpace.h" 50 #import "WKProcessGroup Internal.h"50 #import "WKProcessGroupPrivate.h" 51 51 #import "WKRemoteObjectRegistryInternal.h" 52 52 #import "WKRenderingProgressEventsInternal.h" … … 163 163 _pageLoadStateObserver = std::make_unique<PageLoadStateObserver>(self); 164 164 _page->pageLoadState().addObserver(*_pageLoadStateObserver); 165 }166 167 - (WKProcessGroup *)processGroup168 {169 return wrapper(_page->process().context());170 }171 172 - (WKBrowsingContextGroup *)browsingContextGroup173 {174 return wrapper(_page->pageGroup());175 165 } 176 166 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClass.mm
r162541 r162562 25 25 26 26 #import "config.h" 27 #import "WKProcessClass .h"27 #import "WKProcessClassInternal.h" 28 28 29 29 #if WK_API_ENABLED 30 30 31 #import "WKObject.h" 32 #import "WKProcessClassConfigurationPrivate.h" 33 #import "WebContext.h" 31 34 #import <wtf/RetainPtr.h> 35 36 #if PLATFORM(IOS) 37 #import <WebCore/WebCoreThreadSystemInterface.h> 38 #endif 32 39 33 40 @implementation WKProcessClass { 34 41 RetainPtr<WKProcessClassConfiguration> _configuration; 42 43 API::ObjectStorage<WebKit::WebContext> _context; 35 44 } 36 45 … … 42 51 _configuration = adoptNS([configuration copy]); 43 52 44 // FIXME: Create a WebContext. 53 #if PLATFORM(IOS) 54 // FIXME: Remove once <rdar://problem/15256572> is fixed. 55 InitWebCoreThreadSystemInterface(); 56 #endif 57 58 String bundlePath; 59 if (NSURL *bundleURL = [_configuration _injectedBundleURL]) { 60 if (!bundleURL.isFileURL) 61 [NSException raise:NSInvalidArgumentException format:@"Injected Bundle URL must be a file URL"]; 62 63 bundlePath = bundleURL.path; 64 } 65 66 API::Object::constructInWrapper<WebKit::WebContext>(self, bundlePath); 45 67 46 68 return self; 69 } 70 71 - (void)dealloc 72 { 73 _context->~WebContext(); 74 75 [super dealloc]; 47 76 } 48 77 … … 52 81 } 53 82 83 - (API::Object&)_apiObject 84 { 85 return *_context; 86 } 87 54 88 @end 55 89 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessClassInternal.h
r162561 r162562 1 1 /* 2 * Copyright (C) 201 3Apple Inc. All rights reserved.2 * Copyright (C) 2014 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 24 24 */ 25 25 26 #import "WKProcess GroupPrivate.h"26 #import "WKProcessClass.h" 27 27 28 28 #if WK_API_ENABLED … … 33 33 namespace WebKit { 34 34 35 inline WKProcess Group*wrapper(WebContext& context)35 inline WKProcessClass *wrapper(WebContext& context) 36 36 { 37 ASSERT([context.wrapper() isKindOfClass:[WKProcess Groupclass]]);38 return (WKProcess Group*)context.wrapper();37 ASSERT([context.wrapper() isKindOfClass:[WKProcessClass class]]); 38 return (WKProcessClass *)context.wrapper(); 39 39 } 40 40 41 41 } 42 42 43 @interface WKProcess Group() <WKObject>43 @interface WKProcessClass () <WKObject> 44 44 @end 45 45 -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm
r160882 r162562 25 25 26 26 #import "config.h" 27 #import "WKProcessGroup Internal.h"27 #import "WKProcessGroupPrivate.h" 28 28 29 29 #if WK_API_ENABLED … … 35 35 #import "WKBrowsingContextHistoryDelegate.h" 36 36 #import "WKConnectionInternal.h" 37 #import "WKContext.h"38 37 #import "WKNSString.h" 39 38 #import "WKNSURL.h" … … 43 42 #import "WeakObjCPtr.h" 44 43 #import "WebCertificateInfo.h" 44 #import "WebContext.h" 45 45 #import "WebFrameProxy.h" 46 46 #import <wtf/RetainPtr.h> … … 55 55 56 56 @implementation WKProcessGroup { 57 API::ObjectStorage<WebContext> _context;57 RefPtr<WebContext> _context; 58 58 59 59 WeakObjCPtr<id <WKProcessGroupDelegate>> _delegate; … … 62 62 RetainPtr<WKGeolocationProviderIOS> _geolocationProvider; 63 63 #endif // PLATFORM(IOS) 64 }65 66 - (void)dealloc67 {68 _context->~WebContext();69 70 [super dealloc];71 64 } 72 65 … … 197 190 #endif 198 191 199 API::Object::constructInWrapper<WebContext>(self,bundleURL ? String([bundleURL path]) : String());192 _context = WebContext::create(bundleURL ? String([bundleURL path]) : String()); 200 193 201 194 setUpConnectionClient(self, toAPI(_context.get())); … … 220 213 } 221 214 222 #pragma mark WKObject protocol implementation223 224 - (API::Object&)_apiObject225 {226 return *_context;227 }228 229 215 @end 230 216 -
trunk/Source/WebKit2/UIProcess/API/ios/WKContentView.mm
r162556 r162562 35 35 #import "WKGeolocationProviderIOS.h" 36 36 #import "WKInteractionView.h" 37 #import "WKProcessGroup Internal.h"37 #import "WKProcessGroupPrivate.h" 38 38 #import "WebContext.h" 39 39 #import "WebFrameProxy.h" … … 300 300 - (void)_decidePolicyForGeolocationRequestFromOrigin:(WebSecurityOrigin&)origin frame:(WebFrameProxy&)frame request:(GeolocationPermissionRequestProxy&)permissionRequest 301 301 { 302 [[wrapper(_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:toAPI(&origin) frame:toAPI(&frame) request:toAPI(&permissionRequest) window:[self window]]; 302 // FIXME: The line below is commented out since wrapper(WebContext&) now returns a WKProcessClass. 303 // As part of the new API we should figure out where geolocation fits in, see <rdar://problem/15885544>. 304 // [[wrapper(_page->process().context()) _geolocationProvider] decidePolicyForGeolocationRequestFromOrigin:toAPI(&origin) frame:toAPI(&frame) request:toAPI(&permissionRequest) window:[self window]]; 303 305 } 304 306 -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r162554 r162562 145 145 1A3CC16618906ACF001E6ED8 /* WKWebView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */; }; 146 146 1A3CC16718906ACF001E6ED8 /* WKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16518906ACF001E6ED8 /* WKWebView.h */; }; 147 1A3CC16918907EB0001E6ED8 /* WKProcessClassInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3CC16818907EB0001E6ED8 /* WKProcessClassInternal.h */; }; 147 148 1A3D610113A7CC2A00F95D4E /* PluginModuleInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */; }; 148 149 1A3D610213A7CC2A00F95D4E /* PluginModuleInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */; }; … … 822 823 7C135AA9173B0BCA00586AE2 /* WKPluginInformation.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C135AA7173B0BCA00586AE2 /* WKPluginInformation.h */; settings = {ATTRIBUTES = (Private, ); }; }; 823 824 7C135AAC173B0CFF00586AE2 /* PluginInformationMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7C135AAA173B0CFF00586AE2 /* PluginInformationMac.mm */; }; 824 7C1FB3C01846AEFC001A03D8 /* WKProcessGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C1FB3BF1846AEFC001A03D8 /* WKProcessGroupInternal.h */; };825 825 7C387434172F5615001BD88A /* PageBanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C387433172F5615001BD88A /* PageBanner.cpp */; }; 826 826 7C3F8C90173AF52D007B7F39 /* PluginInformation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C3F8C8E173AF52D007B7F39 /* PluginInformation.cpp */; }; … … 1764 1764 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKWebView.mm; sourceTree = "<group>"; }; 1765 1765 1A3CC16518906ACF001E6ED8 /* WKWebView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKWebView.h; sourceTree = "<group>"; }; 1766 1A3CC16818907EB0001E6ED8 /* WKProcessClassInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessClassInternal.h; sourceTree = "<group>"; }; 1766 1767 1A3D60FF13A7CC2A00F95D4E /* PluginModuleInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginModuleInfo.cpp; sourceTree = "<group>"; }; 1767 1768 1A3D610013A7CC2A00F95D4E /* PluginModuleInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginModuleInfo.h; sourceTree = "<group>"; }; … … 2518 2519 7C135AA7173B0BCA00586AE2 /* WKPluginInformation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPluginInformation.h; sourceTree = "<group>"; }; 2519 2520 7C135AAA173B0CFF00586AE2 /* PluginInformationMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PluginInformationMac.mm; sourceTree = "<group>"; }; 2520 7C1FB3BF1846AEFC001A03D8 /* WKProcessGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKProcessGroupInternal.h; sourceTree = "<group>"; };2521 2521 7C387433172F5615001BD88A /* PageBanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageBanner.cpp; sourceTree = "<group>"; }; 2522 2522 7C3F8C8E173AF52D007B7F39 /* PluginInformation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginInformation.cpp; sourceTree = "<group>"; }; … … 3505 3505 BCBAACE5145225C90053F82F /* WKProcessGroup.h */, 3506 3506 BCBAACE6145225CA0053F82F /* WKProcessGroup.mm */, 3507 7C1FB3BF1846AEFC001A03D8 /* WKProcessGroupInternal.h */,3508 3507 BCBAACE7145225CB0053F82F /* WKProcessGroupPrivate.h */, 3509 3508 75A8D2C4187CCF9F00C39C9E /* WKSession.h */, … … 4225 4224 1A43E827188F3CDC009E4D30 /* WKProcessClassConfiguration.mm */, 4226 4225 1A43E82B188F3CF5009E4D30 /* WKProcessClassConfigurationPrivate.h */, 4226 1A3CC16818907EB0001E6ED8 /* WKProcessClassInternal.h */, 4227 4227 1A3CC16518906ACF001E6ED8 /* WKWebView.h */, 4228 4228 1A3CC16418906ACF001E6ED8 /* WKWebView.mm */, … … 6204 6204 1A232903162C867300D82F7A /* MessageDecoder.h in Headers */, 6205 6205 51FCB18617BBFE0300394CD8 /* AsynchronousNetworkLoaderClient.h in Headers */, 6206 1A3CC16918907EB0001E6ED8 /* WKProcessClassInternal.h in Headers */, 6206 6207 2D1B5D5E185869C8006C6596 /* ViewGestureControllerMessages.h in Headers */, 6207 6208 1A2328FF162C866A00D82F7A /* MessageEncoder.h in Headers */, … … 6674 6675 51D0D437183B353D0097041D /* DatabaseProcessIDBConnectionMessages.h in Headers */, 6675 6676 E134F01712EA5D33004EC58D /* WKPrintingView.h in Headers */, 6676 7C1FB3C01846AEFC001A03D8 /* WKProcessGroupInternal.h in Headers */,6677 6677 BCBAACED145225E30053F82F /* WKProcessGroupPrivate.h in Headers */, 6678 6678 512F58FC12A88A5400629530 /* WKProtectionSpace.h in Headers */,
Note: See TracChangeset
for help on using the changeset viewer.