Changeset 256561 in webkit
- Timestamp:
- Feb 13, 2020 3:08:15 PM (4 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r256531 r256561 1 2020-02-13 Alex Christensen <achristensen@webkit.org> 2 3 Deprecate _WKUserContentWorld replaced by WKContentWorld 4 https://bugs.webkit.org/show_bug.cgi?id=207514 5 6 Reviewed by Brady Eidson. 7 8 _WKUserContentWorld.contentWorld is not needed, 9 but WKContentWorld._userContentWorld needs to return an autoreleased object. 10 11 * UIProcess/API/APIContentWorld.cpp: 12 (API::ContentWorld::fromUserContentWorld): Deleted. 13 * UIProcess/API/APIContentWorld.h: 14 * UIProcess/API/Cocoa/WKContentWorld.mm: 15 (-[WKContentWorld _userContentWorld]): 16 * UIProcess/API/Cocoa/_WKUserContentWorld.h: 17 * UIProcess/API/Cocoa/_WKUserContentWorld.mm: 18 (-[_WKUserContentWorld contentWorld]): Deleted. 19 1 20 2020-02-13 Per Arne Vollan <pvollan@apple.com> 2 21 -
trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp
r256332 r256561 77 77 } 78 78 79 Ref<ContentWorld> ContentWorld::fromUserContentWorld(const UserContentWorld& userContentWorld)80 {81 return adoptRef(*new ContentWorld(userContentWorld));82 }83 84 79 ContentWorld::ContentWorld(const WTF::String& name) 85 80 : ContentWorldBase(name) -
trunk/Source/WebKit/UIProcess/API/APIContentWorld.h
r256332 r256561 62 62 static ContentWorld& pageContentWorld(); 63 63 static ContentWorld& defaultClientWorld(); 64 static Ref<ContentWorld> fromUserContentWorld(const UserContentWorld&);65 64 66 65 virtual ~ContentWorld(); -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm
r256332 r256561 75 75 - (_WKUserContentWorld *)_userContentWorld 76 76 { 77 return wrapper(API::UserContentWorld::fromContentWorld(*_contentWorld));77 return [[wrapper(API::UserContentWorld::fromContentWorld(*_contentWorld)) retain] autorelease]; 78 78 } 79 79 ALLOW_DEPRECATED_DECLARATIONS_END -
trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h
r256376 r256561 26 26 #import <WebKit/WKFoundation.h> 27 27 28 @class WKContentWorld;29 30 28 NS_ASSUME_NONNULL_BEGIN 31 29 … … 38 36 @property (nullable, nonatomic, readonly, copy) NSString *name; 39 37 40 @property (nonatomic, copy, readonly) WKContentWorld *contentWorld WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));41 42 38 @end 43 39 -
trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm
r256376 r256561 27 27 #import "_WKUserContentWorldInternal.h" 28 28 29 #import "WKContentWorldInternal.h"30 31 29 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN 32 30 @implementation _WKUserContentWorld … … 56 54 } 57 55 58 - (WKContentWorld *)contentWorld59 {60 return wrapper(API::ContentWorld::fromUserContentWorld(*_userContentWorld));61 }62 63 56 #pragma mark WKObject protocol implementation 64 57
Note: See TracChangeset
for help on using the changeset viewer.