Title: [256561] trunk/Source/WebKit
- Revision
- 256561
- Author
- [email protected]
- Date
- 2020-02-13 15:08:15 -0800 (Thu, 13 Feb 2020)
Log Message
Deprecate _WKUserContentWorld replaced by WKContentWorld
https://bugs.webkit.org/show_bug.cgi?id=207514
Reviewed by Brady Eidson.
_WKUserContentWorld.contentWorld is not needed,
but WKContentWorld._userContentWorld needs to return an autoreleased object.
* UIProcess/API/APIContentWorld.cpp:
(API::ContentWorld::fromUserContentWorld): Deleted.
* UIProcess/API/APIContentWorld.h:
* UIProcess/API/Cocoa/WKContentWorld.mm:
(-[WKContentWorld _userContentWorld]):
* UIProcess/API/Cocoa/_WKUserContentWorld.h:
* UIProcess/API/Cocoa/_WKUserContentWorld.mm:
(-[_WKUserContentWorld contentWorld]): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (256560 => 256561)
--- trunk/Source/WebKit/ChangeLog 2020-02-13 23:05:55 UTC (rev 256560)
+++ trunk/Source/WebKit/ChangeLog 2020-02-13 23:08:15 UTC (rev 256561)
@@ -1,3 +1,22 @@
+2020-02-13 Alex Christensen <[email protected]>
+
+ Deprecate _WKUserContentWorld replaced by WKContentWorld
+ https://bugs.webkit.org/show_bug.cgi?id=207514
+
+ Reviewed by Brady Eidson.
+
+ _WKUserContentWorld.contentWorld is not needed,
+ but WKContentWorld._userContentWorld needs to return an autoreleased object.
+
+ * UIProcess/API/APIContentWorld.cpp:
+ (API::ContentWorld::fromUserContentWorld): Deleted.
+ * UIProcess/API/APIContentWorld.h:
+ * UIProcess/API/Cocoa/WKContentWorld.mm:
+ (-[WKContentWorld _userContentWorld]):
+ * UIProcess/API/Cocoa/_WKUserContentWorld.h:
+ * UIProcess/API/Cocoa/_WKUserContentWorld.mm:
+ (-[_WKUserContentWorld contentWorld]): Deleted.
+
2020-02-13 Per Arne Vollan <[email protected]>
[iOS] Check if PIP is supported in the UI process
Modified: trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp (256560 => 256561)
--- trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp 2020-02-13 23:05:55 UTC (rev 256560)
+++ trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp 2020-02-13 23:08:15 UTC (rev 256561)
@@ -76,11 +76,6 @@
return *world.get();
}
-Ref<ContentWorld> ContentWorld::fromUserContentWorld(const UserContentWorld& userContentWorld)
-{
- return adoptRef(*new ContentWorld(userContentWorld));
-}
-
ContentWorld::ContentWorld(const WTF::String& name)
: ContentWorldBase(name)
{
Modified: trunk/Source/WebKit/UIProcess/API/APIContentWorld.h (256560 => 256561)
--- trunk/Source/WebKit/UIProcess/API/APIContentWorld.h 2020-02-13 23:05:55 UTC (rev 256560)
+++ trunk/Source/WebKit/UIProcess/API/APIContentWorld.h 2020-02-13 23:08:15 UTC (rev 256561)
@@ -61,7 +61,6 @@
static Ref<ContentWorld> sharedWorldWithName(const WTF::String&);
static ContentWorld& pageContentWorld();
static ContentWorld& defaultClientWorld();
- static Ref<ContentWorld> fromUserContentWorld(const UserContentWorld&);
virtual ~ContentWorld();
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm (256560 => 256561)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm 2020-02-13 23:05:55 UTC (rev 256560)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm 2020-02-13 23:08:15 UTC (rev 256561)
@@ -74,7 +74,7 @@
ALLOW_DEPRECATED_DECLARATIONS_BEGIN
- (_WKUserContentWorld *)_userContentWorld
{
- return wrapper(API::UserContentWorld::fromContentWorld(*_contentWorld));
+ return [[wrapper(API::UserContentWorld::fromContentWorld(*_contentWorld)) retain] autorelease];
}
ALLOW_DEPRECATED_DECLARATIONS_END
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h (256560 => 256561)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-02-13 23:05:55 UTC (rev 256560)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h 2020-02-13 23:08:15 UTC (rev 256561)
@@ -25,8 +25,6 @@
#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))
@@ -37,8 +35,6 @@
@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 (256560 => 256561)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm 2020-02-13 23:05:55 UTC (rev 256560)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm 2020-02-13 23:08:15 UTC (rev 256561)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes