Log Message
Deprecate _WKUserContentWorld replaced by WKContentWorld https://bugs.webkit.org/show_bug.cgi?id=207514
Add the rest of the SPI to convert between the two. * UIProcess/API/Cocoa/_WKUserContentWorld.h: * UIProcess/API/Cocoa/_WKUserContentWorld.mm: (-[_WKUserContentWorld contentWorld]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (256344 => 256345)
--- trunk/Source/WebKit/ChangeLog 2020-02-11 21:08:09 UTC (rev 256344)
+++ trunk/Source/WebKit/ChangeLog 2020-02-11 21:09:21 UTC (rev 256345)
@@ -3,6 +3,17 @@
Deprecate _WKUserContentWorld replaced by WKContentWorld
https://bugs.webkit.org/show_bug.cgi?id=207514
+ Add the rest of the SPI to convert between the two.
+
+ * UIProcess/API/Cocoa/_WKUserContentWorld.h:
+ * UIProcess/API/Cocoa/_WKUserContentWorld.mm:
+ (-[_WKUserContentWorld contentWorld]):
+
+2020-02-11 Alex Christensen <achristen...@webkit.org>
+
+ Deprecate _WKUserContentWorld replaced by WKContentWorld
+ https://bugs.webkit.org/show_bug.cgi?id=207514
+
Reviewed by Brady Eidson.
I also add SPI to convert between the two to aid a smooth transition.
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h (256344 => 256345)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-02-11 21:08:09 UTC (rev 256344)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-02-11 21:09:21 UTC (rev 256345)
@@ -27,6 +27,8 @@
NS_ASSUME_NONNULL_BEGIN
+@class WKContentWorld;
+
WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKContentWorld", macos(10.12, WK_MAC_TBA), ios(10.0, WK_IOS_TBA))
@interface _WKUserContentWorld : NSObject
@@ -33,6 +35,8 @@
+ (_WKUserContentWorld *)worldWithName:(NSString *)name;
+ (_WKUserContentWorld *)normalWorld;
+@property (nonatomic, copy, readonly) WKContentWorld *contentWorld WK_API_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
@property (nullable, nonatomic, readonly, copy) NSString *name;
@end
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm (256344 => 256345)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm 2020-02-11 21:08:09 UTC (rev 256344)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm 2020-02-11 21:09:21 UTC (rev 256345)
@@ -26,6 +26,8 @@
#import "config.h"
#import "_WKUserContentWorldInternal.h"
+#import "WKContentWorldInternal.h"
+
ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
@implementation _WKUserContentWorld
@@ -53,6 +55,11 @@
return _userContentWorld->name();
}
+- (WKContentWorld *)contentWorld
+{
+ return wrapper(API::ContentWorld::fromUserContentWorld(*_userContentWorld));
+}
+
#pragma mark WKObject protocol implementation
- (API::Object&)_apiObject
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
