Title: [256376] trunk/Source/WebKit
- Revision
- 256376
- Author
- achristen...@apple.com
- Date
- 2020-02-11 14:50:47 -0800 (Tue, 11 Feb 2020)
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 (256375 => 256376)
--- trunk/Source/WebKit/ChangeLog 2020-02-11 22:43:11 UTC (rev 256375)
+++ trunk/Source/WebKit/ChangeLog 2020-02-11 22:50:47 UTC (rev 256376)
@@ -1,3 +1,14 @@
+2020-02-11 Alex Christensen <achristen...@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 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, rolling out r256345.
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h (256375 => 256376)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-02-11 22:43:11 UTC (rev 256375)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-02-11 22:50:47 UTC (rev 256376)
@@ -25,6 +25,8 @@
#import <WebKit/WKFoundation.h>
+@class WKContentWorld;
+
NS_ASSUME_NONNULL_BEGIN
WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKContentWorld", macos(10.12, WK_MAC_TBA), ios(10.0, WK_IOS_TBA))
@@ -35,6 +37,8 @@
@property (nullable, nonatomic, readonly, copy) NSString *name;
+@property (nonatomic, copy, readonly) WKContentWorld *contentWorld WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+
@end
NS_ASSUME_NONNULL_END
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm (256375 => 256376)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm 2020-02-11 22:43:11 UTC (rev 256375)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm 2020-02-11 22:50:47 UTC (rev 256376)
@@ -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
