Changeset 256332 in webkit


Ignore:
Timestamp:
Feb 11, 2020 11:40:03 AM (4 years ago)
Author:
achristensen@apple.com
Message:

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.

  • Shared/Cocoa/APIObject.mm:

(API::Object::newObject):

  • UIProcess/API/APIContentWorld.cpp:

(API::ContentWorld::fromUserContentWorld):
(API::ContentWorld::ContentWorld):

  • UIProcess/API/APIContentWorld.h:

(API::ContentWorldBase::ContentWorldBase):

  • UIProcess/API/APIUserContentWorld.cpp:

(API::UserContentWorld::fromContentWorld):
(API::UserContentWorld::UserContentWorld):

  • UIProcess/API/APIUserContentWorld.h:
  • UIProcess/API/Cocoa/WKContentWorld.mm:

(-[WKContentWorld _userContentWorld]):

  • UIProcess/API/Cocoa/WKContentWorldInternal.h:
  • UIProcess/API/Cocoa/WKContentWorldPrivate.h: Added.
  • UIProcess/API/Cocoa/WKUserContentController.mm:
  • UIProcess/API/Cocoa/WKUserScript.mm:
  • UIProcess/API/Cocoa/_WKUserContentWorld.h:
  • UIProcess/API/Cocoa/_WKUserContentWorld.mm:
  • UIProcess/API/Cocoa/_WKUserContentWorldInternal.h:
  • UIProcess/API/Cocoa/_WKUserStyleSheet.h:
  • UIProcess/API/Cocoa/_WKUserStyleSheet.mm:
  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r256317 r256332  
     12020-02-11  Alex Christensen  <achristensen@webkit.org>
     2
     3        Deprecate _WKUserContentWorld replaced by WKContentWorld
     4        https://bugs.webkit.org/show_bug.cgi?id=207514
     5
     6        Reviewed by Brady Eidson.
     7
     8        I also add SPI to convert between the two to aid a smooth transition.
     9
     10        * Shared/Cocoa/APIObject.mm:
     11        (API::Object::newObject):
     12        * UIProcess/API/APIContentWorld.cpp:
     13        (API::ContentWorld::fromUserContentWorld):
     14        (API::ContentWorld::ContentWorld):
     15        * UIProcess/API/APIContentWorld.h:
     16        (API::ContentWorldBase::ContentWorldBase):
     17        * UIProcess/API/APIUserContentWorld.cpp:
     18        (API::UserContentWorld::fromContentWorld):
     19        (API::UserContentWorld::UserContentWorld):
     20        * UIProcess/API/APIUserContentWorld.h:
     21        * UIProcess/API/Cocoa/WKContentWorld.mm:
     22        (-[WKContentWorld _userContentWorld]):
     23        * UIProcess/API/Cocoa/WKContentWorldInternal.h:
     24        * UIProcess/API/Cocoa/WKContentWorldPrivate.h: Added.
     25        * UIProcess/API/Cocoa/WKUserContentController.mm:
     26        * UIProcess/API/Cocoa/WKUserScript.mm:
     27        * UIProcess/API/Cocoa/_WKUserContentWorld.h:
     28        * UIProcess/API/Cocoa/_WKUserContentWorld.mm:
     29        * UIProcess/API/Cocoa/_WKUserContentWorldInternal.h:
     30        * UIProcess/API/Cocoa/_WKUserStyleSheet.h:
     31        * UIProcess/API/Cocoa/_WKUserStyleSheet.mm:
     32        * WebKit.xcodeproj/project.pbxproj:
     33
    1342020-02-11  Youenn Fablet  <youenn@apple.com>
    235

  • trunk/Source/WebKit/Shared/Cocoa/APIObject.mm

    r255998 r256332  
    353353
    354354    case Type::UserContentWorld:
     355        ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    355356        wrapper = [_WKUserContentWorld alloc];
     357        ALLOW_DEPRECATED_DECLARATIONS_END
    356358        break;
    357359

  • trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp

    r255127 r256332  
    7777}
    7878
     79Ref<ContentWorld> ContentWorld::fromUserContentWorld(const UserContentWorld& userContentWorld)
     80{
     81    return adoptRef(*new ContentWorld(userContentWorld));
     82}
     83
    7984ContentWorld::ContentWorld(const WTF::String& name)
    8085    : ContentWorldBase(name)
    … …  
    8489ContentWorld::ContentWorld(WebKit::ContentWorldIdentifier identifier)
    8590    : ContentWorldBase(identifier)
     91{
     92}
     93
     94ContentWorld::ContentWorld(const UserContentWorld& userContentWorld)
     95    : ContentWorldBase(userContentWorld.identifier(), userContentWorld.name())
    8696{
    8797}

  • trunk/Source/WebKit/UIProcess/API/APIContentWorld.h

    r255127 r256332  
    3232namespace API {
    3333
     34class UserContentWorld;
     35
    3436class ContentWorldBase {
    3537public:
    … …  
    4648    ContentWorldBase(const WTF::String& name);
    4749    ContentWorldBase(WebKit::ContentWorldIdentifier identifier)
     50        : m_identifier(identifier) { }
     51    ContentWorldBase(WebKit::ContentWorldIdentifier identifier, const WTF::String& name)
    4852        : m_identifier(identifier)
    49     {
    50     }
    51 
     53        , m_name(name) { }
    5254private:
    5355    WebKit::ContentWorldIdentifier m_identifier;
    … …  
    6062    static ContentWorld& pageContentWorld();
    6163    static ContentWorld& defaultClientWorld();
     64    static Ref<ContentWorld> fromUserContentWorld(const UserContentWorld&);
    6265
    6366    virtual ~ContentWorld();
    … …  
    6972    explicit ContentWorld(const WTF::String&);
    7073    explicit ContentWorld(WebKit::ContentWorldIdentifier);
     74    explicit ContentWorld(const UserContentWorld&);
    7175};
    7276

  • trunk/Source/WebKit/UIProcess/API/APIUserContentWorld.cpp

    r255127 r256332  
    3636}
    3737
     38Ref<UserContentWorld> UserContentWorld::fromContentWorld(const ContentWorld& contentWorld)
     39{
     40    return adoptRef(*new UserContentWorld(contentWorld));
     41}
     42
    3843UserContentWorld& UserContentWorld::normalWorld()
    3944{
    … …  
    5257}
    5358
     59UserContentWorld::UserContentWorld(const ContentWorld& contentWorld)
     60    : ContentWorldBase(contentWorld.identifier(), contentWorld.name())
     61{
     62}
     63
    5464UserContentWorld::~UserContentWorld()
    5565{

  • trunk/Source/WebKit/UIProcess/API/APIUserContentWorld.h

    r254862 r256332  
    3535    static Ref<UserContentWorld> worldWithName(const WTF::String&);
    3636    static UserContentWorld& normalWorld();
     37    static Ref<UserContentWorld> fromContentWorld(const ContentWorld&);
    3738
    3839    virtual ~UserContentWorld();
    … …  
    4344private:
    4445    explicit UserContentWorld(const WTF::String&);
     46    explicit UserContentWorld(const ContentWorld&);
    4547
    4648    enum class ForNormalWorldOnly { NormalWorld };

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm

    r255998 r256332  
    2626#import "config.h"
    2727#import "WKContentWorldInternal.h"
     28
     29#import "_WKUserContentWorldInternal.h"
    2830
    2931@implementation WKContentWorld
    … …  
    6769
    6870@end
     71
     72@implementation WKContentWorld (WKPrivate)
     73
     74ALLOW_DEPRECATED_DECLARATIONS_BEGIN
     75- (_WKUserContentWorld *)_userContentWorld
     76{
     77    return wrapper(API::UserContentWorld::fromContentWorld(*_contentWorld));
     78}
     79ALLOW_DEPRECATED_DECLARATIONS_END
     80
     81@end

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorldInternal.h

    r255998 r256332  
    2424 */
    2525
    26 #import "WKContentWorld.h"
     26#import "WKContentWorldPrivate.h"
    2727
    2828#import "APIContentWorld.h"

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserContentController.mm

    r252492 r256332  
    173173}
    174174
     175ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    175176- (void)_removeAllUserScriptsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld
    176177{
    177178    _userContentControllerProxy->removeAllUserScripts(*userContentWorld->_userContentWorld);
    178179}
     180ALLOW_DEPRECATED_DECLARATIONS_END
    179181
    180182- (void)_addUserScriptImmediately:(WKUserScript *)userScript
    … …  
    224226}
    225227
     228ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    226229- (void)_removeAllUserStyleSheetsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld
    227230{
    … …  
    245248    _userContentControllerProxy->removeAllUserMessageHandlers(*userContentWorld->_userContentWorld);
    246249}
     250ALLOW_DEPRECATED_DECLARATIONS_END
    247251
    248252@end

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKUserScript.mm

    r242339 r256332  
    7979@implementation WKUserScript (WKPrivate)
    8080
     81ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    8182- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray *)legacyWhitelist legacyBlacklist:(NSArray *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
    8283{
    … …  
    103104    return wrapper(_userScript->userContentWorld());
    104105}
     106ALLOW_DEPRECATED_DECLARATIONS_END
    105107
    106108@end

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

    r243376 r256332  
    2828NS_ASSUME_NONNULL_BEGIN
    2929
    30 WK_CLASS_AVAILABLE(macos(10.12), ios(10.0))
     30WK_CLASS_DEPRECATED_WITH_REPLACEMENT("WKContentWorld", macos(10.12, WK_MAC_TBA), ios(10.0, WK_IOS_TBA))
    3131@interface _WKUserContentWorld : NSObject
    3232

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

    r242339 r256332  
    2727#import "_WKUserContentWorldInternal.h"
    2828
     29ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
    2930@implementation _WKUserContentWorld
    3031
    … …  
    6162
    6263@end
     64ALLOW_DEPRECATED_IMPLEMENTATIONS_END

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h

    r242339 r256332  
    3434
    3535template<> struct WrapperTraits<API::UserContentWorld> {
     36    ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    3637    using WrapperClass = _WKUserContentWorld;
     38    ALLOW_DEPRECATED_DECLARATIONS_END
    3739};
    3840

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.h

    r243376 r256332  
    4242
    4343- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly;
     44#pragma clang diagnostic push
     45#pragma clang diagnostic ignored "-Wdeprecated-declarations"
    4446- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld;
    4547- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist baseURL:(NSURL *)baseURL userContentWorld:(_WKUserContentWorld *)userContentWorld;
     48#pragma clang diagnostic pop
    4649
    4750@end

  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserStyleSheet.mm

    r242339 r256332  
    4848}
    4949
     50ALLOW_DEPRECATED_DECLARATIONS_BEGIN
    5051- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
    5152{
    … …  
    7374    return self;
    7475}
     76ALLOW_DEPRECATED_DECLARATIONS_END
    7577
    7678- (void)dealloc

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r256315 r256332  
    17301730                D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */; };
    17311731                DF462E0F23F22F5500EFF35F /* WKHTTPCookieStorePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1732                DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    17321733                E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */ = {isa = PBXBuildFile; fileRef = E105FE5318D7B9DE008F57A8 /* EditingRange.h */; };
    17331734                E11D35AE16B63D1B006D23D7 /* com.apple.WebProcess.sb in Resources */ = {isa = PBXBuildFile; fileRef = E1967E37150AB5E200C73169 /* com.apple.WebProcess.sb */; };
    … …  
    49954996                D3B9484511FF4B6500032B39 /* WebSearchPopupMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSearchPopupMenu.h; sourceTree = "<group>"; };
    49964997                DF462E0E23F22F5300EFF35F /* WKHTTPCookieStorePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStorePrivate.h; sourceTree = "<group>"; };
     4998                DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKContentWorldPrivate.h; sourceTree = "<group>"; };
    49974999                DF58C6311371AC5800F9A37C /* NativeWebWheelEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeWebWheelEvent.h; sourceTree = "<group>"; };
    49985000                DF58C6351371ACA000F9A37C /* NativeWebWheelEventMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NativeWebWheelEventMac.mm; sourceTree = "<group>"; };
    … …  
    69656967                                511065F923EC956B005443D6 /* WKContentWorld.mm */,
    69666968                                511065FB23EC956B005443D6 /* WKContentWorldInternal.h */,
     6969                                DF462E1123F338AD00EFF35F /* WKContentWorldPrivate.h */,
    69676970                                5CE0C369229F2D4A003695F0 /* WKContextMenuElementInfo.h */,
    69686971                                5CE0C368229F2D4A003695F0 /* WKContextMenuElementInfo.mm */,
    … …  
    1024210245                                E105FE5418D7B9DE008F57A8 /* EditingRange.h in Headers */,
    1024310246                                1AA41AB512C02EC4002BE67B /* EditorState.h in Headers */,
     10247                                DF462E1223F338BE00EFF35F /* WKContentWorldPrivate.h in Headers */,
    1024410248                                BC032DA810F437D10058C15A /* Encoder.h in Headers */,
    1024510249                                51B15A8513843A3900321AD8 /* EnvironmentUtilities.h in Headers */,
Note: See TracChangeset for help on using the changeset viewer.