Changeset 256345 in webkit

Timestamp:

Feb 11, 2020 1:09:21 PM (4 years ago)

Author:

achristensen@apple.com

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]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKUserContentWorld.h (modified) (2 diffs)
• UIProcess/API/Cocoa/_WKUserContentWorld.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-11  Alex Christensen  <achristensen@webkit.org>
+
+        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  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h

@@ -28 +28 @@
 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
@@ -34 +36 @@
 + (_WKUserContentWorld *)normalWorld;
 
+@property (nonatomic, copy, readonly) WKContentWorld *contentWorld WK_API_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
 @property (nullable, nonatomic, readonly, copy) NSString *name;
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm

@@ -27 +27 @@
 #import "_WKUserContentWorldInternal.h"
 
+#import "WKContentWorldInternal.h"
+
 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
 @implementation _WKUserContentWorld
@@ -54 +56 @@
 }
 
+- (WKContentWorld *)contentWorld
+{
+    return wrapper(API::ContentWorld::fromUserContentWorld(*_userContentWorld));
+}
+
 #pragma mark WKObject protocol implementation