Changeset 256561 in webkit


Ignore:
Timestamp:
Feb 13, 2020 3:08:15 PM (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.

_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.

Location:
trunk/Source/WebKit
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r256531 r256561  
     12020-02-13  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        _WKUserContentWorld.contentWorld is not needed,
     9        but WKContentWorld._userContentWorld needs to return an autoreleased object.
     10
     11        * UIProcess/API/APIContentWorld.cpp:
     12        (API::ContentWorld::fromUserContentWorld): Deleted.
     13        * UIProcess/API/APIContentWorld.h:
     14        * UIProcess/API/Cocoa/WKContentWorld.mm:
     15        (-[WKContentWorld _userContentWorld]):
     16        * UIProcess/API/Cocoa/_WKUserContentWorld.h:
     17        * UIProcess/API/Cocoa/_WKUserContentWorld.mm:
     18        (-[_WKUserContentWorld contentWorld]): Deleted.
     19
    1202020-02-13  Per Arne Vollan  <pvollan@apple.com>
    221
  • trunk/Source/WebKit/UIProcess/API/APIContentWorld.cpp

    r256332 r256561  
    7777}
    7878
    79 Ref<ContentWorld> ContentWorld::fromUserContentWorld(const UserContentWorld& userContentWorld)
    80 {
    81     return adoptRef(*new ContentWorld(userContentWorld));
    82 }
    83 
    8479ContentWorld::ContentWorld(const WTF::String& name)
    8580    : ContentWorldBase(name)
  • trunk/Source/WebKit/UIProcess/API/APIContentWorld.h

    r256332 r256561  
    6262    static ContentWorld& pageContentWorld();
    6363    static ContentWorld& defaultClientWorld();
    64     static Ref<ContentWorld> fromUserContentWorld(const UserContentWorld&);
    6564
    6665    virtual ~ContentWorld();
  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKContentWorld.mm

    r256332 r256561  
    7575- (_WKUserContentWorld *)_userContentWorld
    7676{
    77     return wrapper(API::UserContentWorld::fromContentWorld(*_contentWorld));
     77    return [[wrapper(API::UserContentWorld::fromContentWorld(*_contentWorld)) retain] autorelease];
    7878}
    7979ALLOW_DEPRECATED_DECLARATIONS_END
  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.h

    r256376 r256561  
    2626#import <WebKit/WKFoundation.h>
    2727
    28 @class WKContentWorld;
    29 
    3028NS_ASSUME_NONNULL_BEGIN
    3129
     
    3836@property (nullable, nonatomic, readonly, copy) NSString *name;
    3937
    40 @property (nonatomic, copy, readonly) WKContentWorld *contentWorld WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    41 
    4238@end
    4339
  • trunk/Source/WebKit/UIProcess/API/Cocoa/_WKUserContentWorld.mm

    r256376 r256561  
    2727#import "_WKUserContentWorldInternal.h"
    2828
    29 #import "WKContentWorldInternal.h"
    30 
    3129ALLOW_DEPRECATED_IMPLEMENTATIONS_BEGIN
    3230@implementation _WKUserContentWorld
     
    5654}
    5755
    58 - (WKContentWorld *)contentWorld
    59 {
    60     return wrapper(API::ContentWorld::fromUserContentWorld(*_userContentWorld));
    61 }
    62 
    6356#pragma mark WKObject protocol implementation
    6457
Note: See TracChangeset for help on using the changeset viewer.