<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181906] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181906">181906</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-03-24 14:17:26 -0700 (Tue, 24 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMObjecth">trunk/Source/WebCore/bindings/objc/DOMObject.h</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMObjectmm">trunk/Source/WebCore/bindings/objc/DOMObject.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListmm">trunk/Source/WebKit/mac/History/WebBackForwardList.mm</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListInternalh">trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-24 Anders Carlsson <andersca@apple.com>
+
+ 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]):
+
</ins><span class="cx"> 2015-03-24 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> CSS Selectors Level 4: enable case-insensitive attribute matching by default
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMObject.h (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2004, 2006, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2006, 2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -39,6 +39,9 @@
</span><span class="cx"> @private
</span><span class="cx"> DOMObjectInternal *_internal;
</span><span class="cx"> }
</span><ins>+
+- (instancetype)init NS_UNAVAILABLE;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMObject (DOMLinkStyle)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOMObject.mm (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2004, 2006, 2006, 2008, 2009 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2004, 2006-2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2006 James G. Speth <speth@end.com>
</span><span class="cx"> * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
</span><span class="cx"> *
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx"> @implementation DOMObject
</span><span class="cx">
</span><span class="cx"> // Prevent creation of DOM objects by clients who just "[[xxx alloc] init]".
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> [NSException raise:NSGenericException format:@"+[%@ init]: should never be used", NSStringFromClass([self class])];
</span><del>- [self release];
</del><ins>+
</ins><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-24 Anders Carlsson <andersca@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2015-03-23 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (Yosemite): WKView visibility notifications are messed up
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.mm (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> return staticBackForwardLists;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@implementation WebBackForwardList (WebBackForwardListInternal)
</del><ins>+@implementation WebBackForwardList
</ins><span class="cx">
</span><span class="cx"> BackForwardList* core(WebBackForwardList *webBackForwardList)
</span><span class="cx"> {
</span><span class="lines">@@ -97,10 +97,6 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-@end
-
-@implementation WebBackForwardList
-
</del><span class="cx"> + (void)initialize
</span><span class="cx"> {
</span><span class="cx"> #if !PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardListInternal.h (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,6 +36,6 @@
</span><span class="cx"> WebCore::BackForwardList* core(WebBackForwardList *);
</span><span class="cx"> WebBackForwardList *kit(WebCore::BackForwardList*);
</span><span class="cx">
</span><del>-@interface WebBackForwardList (WebBackForwardListInternal)
</del><ins>+@interface WebBackForwardList ()
</ins><span class="cx"> - (id)initWithBackForwardList:(PassRefPtr<WebCore::BackForwardList>)backForwardList;
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-24 Anders Carlsson <andersca@apple.com>
+
+ 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:
+
</ins><span class="cx"> 2015-03-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Responses with 404 HTTP Status Code should be cacheable by default
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -57,6 +57,21 @@
</span><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (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;
+}
+
</ins><span class="cx"> - (instancetype)init
</span><span class="cx"> {
</span><span class="cx"> return [self _initWithConfiguration:adoptNS([[_WKProcessPoolConfiguration alloc] init]).get()];
</span><span class="lines">@@ -113,21 +128,6 @@
</span><span class="cx"> return [url URLByAppendingPathComponent:@"WebsiteData" isDirectory:YES];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (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;
-}
-
</del><span class="cx"> - (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host
</span><span class="cx"> {
</span><span class="cx"> _processPool->allowSpecificHTTPSCertificateForHost(WebKit::WebCertificateInfo::create(WebCore::CertificateInfo((CFArrayRef)certificateChain)).get(), host);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (181905 => 181906)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,10 +30,12 @@
</span><span class="cx"> @class _WKProcessPoolConfiguration;
</span><span class="cx"> @protocol _WKDownloadDelegate;
</span><span class="cx">
</span><ins>+@interface WKProcessPool ()
+- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) WK_DESIGNATED_INITIALIZER;
+@end
+
</ins><span class="cx"> @interface WKProcessPool (WKPrivate)
</span><span class="cx">
</span><del>-- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init)));
-
</del><span class="cx"> @property (nonatomic, readonly) _WKProcessPoolConfiguration *_configuration;
</span><span class="cx">
</span><span class="cx"> - (void)_setAllowsSpecificHTTPSCertificate:(NSArray *)certificateChain forHost:(NSString *)host;
</span></span></pre>
</div>
</div>
</body>
</html>