Diff
Modified: trunk/Source/WebCore/ChangeLog (181905 => 181906)
--- trunk/Source/WebCore/ChangeLog 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebCore/ChangeLog 2015-03-24 21:17:26 UTC (rev 181906)
@@ -1,3 +1,17 @@
+2015-03-24 Anders Carlsson <[email protected]>
+
+ Fix designated initializer violations
+ https://bugs.webkit.org/show_bug.cgi?id=143016
+ rdar://problem/20268858
+
+ Reviewed by Dan Bernstein.
+
+ Mark -[DOMObject init] as unavailable.
+
+ * bindings/objc/DOMObject.h:
+ * bindings/objc/DOMObject.mm:
+ (-[DOMObject init]):
+
2015-03-24 Benjamin Poulain <[email protected]>
CSS Selectors Level 4: enable case-insensitive attribute matching by default
Modified: trunk/Source/WebCore/bindings/objc/DOMObject.h (181905 => 181906)
--- trunk/Source/WebCore/bindings/objc/DOMObject.h 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebCore/bindings/objc/DOMObject.h 2015-03-24 21:17:26 UTC (rev 181906)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2006, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006, 2009, 2015 Apple Inc. All rights reserved.
* Copyright (C) 2006 Samuel Weinig <[email protected]>
*
* Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,9 @@
@private
DOMObjectInternal *_internal;
}
+
+- (instancetype)init NS_UNAVAILABLE;
+
@end
@interface DOMObject (DOMLinkStyle)
Modified: trunk/Source/WebCore/bindings/objc/DOMObject.mm (181905 => 181906)
--- trunk/Source/WebCore/bindings/objc/DOMObject.mm 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebCore/bindings/objc/DOMObject.mm 2015-03-24 21:17:26 UTC (rev 181906)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2006, 2006, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006-2009, 2015 Apple Inc. All rights reserved.
* Copyright (C) 2006 James G. Speth <[email protected]>
* Copyright (C) 2006 Samuel Weinig <[email protected]>
*
@@ -42,10 +42,10 @@
@implementation DOMObject
// Prevent creation of DOM objects by clients who just "[[xxx alloc] init]".
-- (id)init
+- (instancetype)init
{
[NSException raise:NSGenericException format:@"+[%@ init]: should never be used", NSStringFromClass([self class])];
- [self release];
+
return nil;
}
Modified: trunk/Source/WebKit/mac/ChangeLog (181905 => 181906)
--- trunk/Source/WebKit/mac/ChangeLog 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-03-24 21:17:26 UTC (rev 181906)
@@ -1,3 +1,17 @@
+2015-03-24 Anders Carlsson <[email protected]>
+
+ Fix designated initializer violations
+ https://bugs.webkit.org/show_bug.cgi?id=143016
+ rdar://problem/20268858
+
+ Reviewed by Dan Bernstein.
+
+ Move -[WebBackForwardList initWithBackForwardList:] to the implementation instead of a category since
+ nobody calls it outside of WebBackForwardList.mm.
+
+ * History/WebBackForwardList.mm:
+ * History/WebBackForwardListInternal.h:
+
2015-03-23 Alexey Proskuryakov <[email protected]>
REGRESSION (Yosemite): WKView visibility notifications are messed up
Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.mm (181905 => 181906)
--- trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebKit/mac/History/WebBackForwardList.mm 2015-03-24 21:17:26 UTC (rev 181906)
@@ -64,7 +64,7 @@
return staticBackForwardLists;
}
-@implementation WebBackForwardList (WebBackForwardListInternal)
+@implementation WebBackForwardList
BackForwardList* core(WebBackForwardList *webBackForwardList)
{
@@ -97,10 +97,6 @@
return self;
}
-@end
-
-@implementation WebBackForwardList
-
+ (void)initialize
{
#if !PLATFORM(IOS)
Modified: trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h (181905 => 181906)
--- trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h 2015-03-24 21:17:26 UTC (rev 181906)
@@ -36,6 +36,6 @@
WebCore::BackForwardList* core(WebBackForwardList *);
WebBackForwardList *kit(WebCore::BackForwardList*);
-@interface WebBackForwardList (WebBackForwardListInternal)
+@interface WebBackForwardList ()
- (id)initWithBackForwardList:(PassRefPtr<WebCore::BackForwardList>)backForwardList;
@end
Modified: trunk/Source/WebKit2/ChangeLog (181905 => 181906)
--- trunk/Source/WebKit2/ChangeLog 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-24 21:17:26 UTC (rev 181906)
@@ -1,3 +1,17 @@
+2015-03-24 Anders Carlsson <[email protected]>
+
+ Fix designated initializer violations
+ https://bugs.webkit.org/show_bug.cgi?id=143016
+ rdar://problem/20268858
+
+ Reviewed by Dan Bernstein.
+
+ 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:
+
2015-03-24 Chris Dumez <[email protected]>
[WK2] Responses with 404 HTTP Status Code should be cacheable by default
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (181905 => 181906)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2015-03-24 21:17:26 UTC (rev 181906)
@@ -57,6 +57,21 @@
#endif // PLATFORM(IOS)
}
+- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration
+{
+ if (!(self = [super init]))
+ return nil;
+
+#if PLATFORM(IOS)
+ // FIXME: Remove once <rdar://problem/15256572> is fixed.
+ InitWebCoreThreadSystemInterface();
+#endif
+
+ API::Object::constructInWrapper<WebKit::WebProcessPool>(self, *configuration->_processPoolConfiguration);
+
+ return self;
+}
+
- (instancetype)init
{
return [self _initWithConfiguration:adoptNS([[_WKProcessPoolConfiguration alloc] init]).get()];
@@ -113,21 +128,6 @@
return [url URLByAppendingPathComponent:@"WebsiteData" isDirectory:YES];
}
-- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration
-{
- if (!(self = [super init]))
- return nil;
-
-#if PLATFORM(IOS)
- // FIXME: Remove once <rdar://problem/15256572> is fixed.
- InitWebCoreThreadSystemInterface();
-#endif
-
- API::Object::constructInWrapper<WebKit::WebProcessPool>(self, *configuration->_processPoolConfiguration);
-
- return self;
-}
-
- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
{
_processPool->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).get(), host);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (181905 => 181906)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2015-03-24 21:16:52 UTC (rev 181905)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2015-03-24 21:17:26 UTC (rev 181906)
@@ -30,10 +30,12 @@
@class _WKProcessPoolConfiguration;
@protocol _WKDownloadDelegate;
+@interface WKProcessPool ()
+- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) WK_DESIGNATED_INITIALIZER;
+@end
+
@interface WKProcessPool (WKPrivate)
-- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init)));
-
@property (nonatomic, readonly) _WKProcessPoolConfiguration *_configuration;
- (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
