Title: [256373] trunk/Source/WebKit
Revision
256373
Author
ryanhad...@apple.com
Date
2020-02-11 14:36:56 -0800 (Tue, 11 Feb 2020)

Log Message

Unreviewed, rolling out r256345.

Broke iOS builds.

Reverted changeset:

"Deprecate _WKUserContentWorld replaced by WKContentWorld"
https://bugs.webkit.org/show_bug.cgi?id=207514
https://trac.webkit.org/changeset/256345

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (256372 => 256373)


--- trunk/Source/WebKit/ChangeLog	2020-02-11 22:36:48 UTC (rev 256372)
+++ trunk/Source/WebKit/ChangeLog	2020-02-11 22:36:56 UTC (rev 256373)
@@ -1,3 +1,15 @@
+2020-02-11  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, rolling out r256345.
+
+        Broke iOS builds.
+
+        Reverted changeset:
+
+        "Deprecate _WKUserContentWorld replaced by WKContentWorld"
+        https://bugs.webkit.org/show_bug.cgi?id=207514
+        https://trac.webkit.org/changeset/256345
+
 2020-02-11  Per Arne Vollan  <pvol...@apple.com>
 
         [iOS] Deny mach lookup access to the tccd service in the WebContent process

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h (256372 => 256373)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h	2020-02-11 22:36:48 UTC (rev 256372)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h	2020-02-11 22:36:56 UTC (rev 256373)
@@ -27,8 +27,6 @@
 
 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
 
@@ -35,8 +33,6 @@
 + (_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 (256372 => 256373)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm	2020-02-11 22:36:48 UTC (rev 256372)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm	2020-02-11 22:36:56 UTC (rev 256373)
@@ -26,8 +26,6 @@
 #import "config.h"
 #import "_WKUserContentWorldInternal.h"
 
-#import "WKContentWorldInternal.h"
-
 ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
 @implementation _WKUserContentWorld
 
@@ -55,11 +53,6 @@
     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

Reply via email to