Changeset 181906 in webkit


Ignore:
Timestamp:
Mar 24, 2015, 2:17:26 PM (10 years ago)
Author:
andersca@apple.com
Message:

Fix designated initializer violations
​https://bugs.webkit.org/show_bug.cgi?id=143016
rdar://problem/20268858

Reviewed by Dan Bernstein.

Source/WebCore:

Mark -[DOMObject init] as unavailable.

  • bindings/objc/DOMObject.h:
  • bindings/objc/DOMObject.mm:

(-[DOMObject init]):

Source/WebKit/mac:

Move -[WebBackForwardList initWithBackForwardList:] to the implementation instead of a category since
nobody calls it outside of WebBackForwardList.mm.

  • History/WebBackForwardList.mm:
  • History/WebBackForwardListInternal.h:

Source/WebKit2:

Move -[WKProcessPool _initWithConfiguration:] to a class extension so we can make it the designated initializer.

  • UIProcess/API/Cocoa/WKProcessPool.mm:

(-[WKProcessPool _initWithConfiguration:]):

  • UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
Location:
trunk/Source
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r181900 r181906  
     12015-03-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Fix designated initializer violations
     4        https://bugs.webkit.org/show_bug.cgi?id=143016
     5        rdar://problem/20268858
     6
     7        Reviewed by Dan Bernstein.
     8
     9        Mark -[DOMObject init] as unavailable.
     10
     11        * bindings/objc/DOMObject.h:
     12        * bindings/objc/DOMObject.mm:
     13        (-[DOMObject init]):
     14
    1152015-03-24  Benjamin Poulain  <benjamin@webkit.org>
    216

  • trunk/Source/WebCore/bindings/objc/DOMObject.h

    r165676 r181906  
    11/*
    2  * Copyright (C) 2004, 2006, 2009 Apple Inc. All rights reserved.
     2 * Copyright (C) 2004, 2006, 2009, 2015 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    44 *
    … …  
    4040    DOMObjectInternal *_internal;
    4141}
     42
     43- (instancetype)init NS_UNAVAILABLE;
     44
    4245@end
    4346

  • trunk/Source/WebCore/bindings/objc/DOMObject.mm

    r165676 r181906  
    11/*
    2  * Copyright (C) 2004, 2006, 2006, 2008, 2009 Apple Inc. All rights reserved.
     2 * Copyright (C) 2004, 2006-2009, 2015 Apple Inc. All rights reserved.
    33 * Copyright (C) 2006 James G. Speth <speth@end.com>
    44 * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    … …  
    4343
    4444// Prevent creation of DOM objects by clients who just "[[xxx alloc] init]".
    45 - (id)init
     45- (instancetype)init
    4646{
    4747    [NSException raise:NSGenericException format:@"+[%@ init]: should never be used", NSStringFromClass([self class])];
    48     [self release];
     48
    4949    return nil;
    5050}

  • trunk/Source/WebKit/mac/ChangeLog

    r181866 r181906  
     12015-03-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Fix designated initializer violations
     4        https://bugs.webkit.org/show_bug.cgi?id=143016
     5        rdar://problem/20268858
     6
     7        Reviewed by Dan Bernstein.
     8
     9        Move -[WebBackForwardList initWithBackForwardList:] to the implementation instead of a category since
     10        nobody calls it outside of WebBackForwardList.mm.
     11
     12        * History/WebBackForwardList.mm:
     13        * History/WebBackForwardListInternal.h:
     14
    1152015-03-23  Alexey Proskuryakov  <ap@apple.com>
    216

  • trunk/Source/WebKit/mac/History/WebBackForwardList.mm

    r179472 r181906  
    6565}
    6666
    67 @implementation WebBackForwardList (WebBackForwardListInternal)
     67@implementation WebBackForwardList
    6868
    6969BackForwardList* core(WebBackForwardList *webBackForwardList)
    … …  
    9797    return self;
    9898}
    99 
    100 @end
    101 
    102 @implementation WebBackForwardList
    10399
    104100+ (void)initialize

  • trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h

    r168085 r181906  
    3737WebBackForwardList *kit(WebCore::BackForwardList*);
    3838
    39 @interface WebBackForwardList (WebBackForwardListInternal)
     39@interface WebBackForwardList ()
    4040- (id)initWithBackForwardList:(PassRefPtr<WebCore::BackForwardList>)backForwardList;
    4141@end

  • trunk/Source/WebKit2/ChangeLog

    r181904 r181906  
     12015-03-24  Anders Carlsson  <andersca@apple.com>
     2
     3        Fix designated initializer violations
     4        https://bugs.webkit.org/show_bug.cgi?id=143016
     5        rdar://problem/20268858
     6
     7        Reviewed by Dan Bernstein.
     8
     9        Move -[WKProcessPool _initWithConfiguration:] to a class extension so we can make it the designated initializer.
     10
     11        * UIProcess/API/Cocoa/WKProcessPool.mm:
     12        (-[WKProcessPool _initWithConfiguration:]):
     13        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
     14
    1152015-03-24  Chris Dumez  <cdumez@apple.com>
    216

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm

    r178685 r181906  
    5858}
    5959
     60- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration
     61{
     62    if (!(self = [super init]))
     63        return nil;
     64
     65#if PLATFORM(IOS)
     66    // FIXME: Remove once <rdar://problem/15256572> is fixed.
     67    InitWebCoreThreadSystemInterface();
     68#endif
     69
     70    API::Object::constructInWrapper<WebKit::WebProcessPool>(self, *configuration->_processPoolConfiguration);
     71
     72    return self;
     73}
     74
    6075- (instancetype)init
    6176{
    … …  
    112127
    113128    return [url URLByAppendingPathComponent:@"WebsiteData" isDirectory:YES];
    114 }
    115 
    116 - (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration
    117 {
    118     if (!(self = [super init]))
    119         return nil;
    120 
    121 #if PLATFORM(IOS)
    122     // FIXME: Remove once <rdar://problem/15256572> is fixed.
    123     InitWebCoreThreadSystemInterface();
    124 #endif
    125 
    126     API::Object::constructInWrapper<WebKit::WebProcessPool>(self, *configuration->_processPoolConfiguration);
    127 
    128     return self;
    129129}
    130130

  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

    r178634 r181906  
    3131@protocol _WKDownloadDelegate;
    3232
     33@interface WKProcessPool ()
     34- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) WK_DESIGNATED_INITIALIZER;
     35@end
     36
    3337@interface WKProcessPool (WKPrivate)
    34 
    35 - (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init)));
    3638
    3739@property (nonatomic, readonly) _WKProcessPoolConfiguration *_configuration;
Note: See TracChangeset for help on using the changeset viewer.