<!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>[211468] trunk/Source/WebKit/mac</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/211468">211468</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-31 21:34:31 -0800 (Tue, 31 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>ld: warning: instance method '_setAutofilled:' in category conflicts with same method from another category
https://bugs.webkit.org/show_bug.cgi?id=167684
Reviewed by Dan Bernstein.
* DOM/DOMHTML.mm:
(-[DOMHTMLInputElement _isAutofilled]): Deleted.
(-[DOMHTMLInputElement _setAutofilled:]): Deleted.
Consolidate in the WebDOMOperationsPrivate category.
* DOM/DOMPrivate.h:
Include WebDOMOperationsPrivate header to get other DOM Private categories.
* DOM/WebDOMOperations.mm:
(-[DOMHTMLInputElement _isAutofilled]):
* DOM/WebDOMOperationsPrivate.h:
Include getter alongside the setter.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMHTMLmm">trunk/Source/WebKit/mac/DOM/DOMHTML.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMDOMPrivateh">trunk/Source/WebKit/mac/DOM/DOMPrivate.h</a></li>
<li><a href="#trunkSourceWebKitmacDOMWebDOMOperationsmm">trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm</a></li>
<li><a href="#trunkSourceWebKitmacDOMWebDOMOperationsPrivateh">trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (211467 => 211468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-02-01 03:56:10 UTC (rev 211467)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-02-01 05:34:31 UTC (rev 211468)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-01-31 Joseph Pecoraro <pecoraro@apple.com>
+
+ ld: warning: instance method '_setAutofilled:' in category conflicts with same method from another category
+ https://bugs.webkit.org/show_bug.cgi?id=167684
+
+ Reviewed by Dan Bernstein.
+
+ * DOM/DOMHTML.mm:
+ (-[DOMHTMLInputElement _isAutofilled]): Deleted.
+ (-[DOMHTMLInputElement _setAutofilled:]): Deleted.
+ Consolidate in the WebDOMOperationsPrivate category.
+
+ * DOM/DOMPrivate.h:
+ Include WebDOMOperationsPrivate header to get other DOM Private categories.
+
+ * DOM/WebDOMOperations.mm:
+ (-[DOMHTMLInputElement _isAutofilled]):
+ * DOM/WebDOMOperationsPrivate.h:
+ Include getter alongside the setter.
+
</ins><span class="cx"> 2017-01-31 Jessie Berlin <jberlin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMHTMLmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMHTML.mm (211467 => 211468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMHTML.mm 2017-02-01 03:56:10 UTC (rev 211467)
+++ trunk/Source/WebKit/mac/DOM/DOMHTML.mm 2017-02-01 05:34:31 UTC (rev 211468)
</span><span class="lines">@@ -182,22 +182,6 @@
</span><span class="cx"> return core(self)->isTextField();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-
-- (BOOL)_isAutofilled
-{
- return core(self)->isAutoFilled();
-}
-
-- (void)_setAutofilled:(BOOL)filled
-{
- // This notifies the input element that the content has been autofilled
- // This allows WebKit to obey the -webkit-autofill pseudo style, which
- // changes the background color.
- core(self)->setAutoFilled(filled);
-}
-#endif // PLATFORM(IOS)
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation DOMHTMLSelectElement (FormAutoFillTransition)
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMDOMPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/DOMPrivate.h (211467 => 211468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/DOMPrivate.h 2017-02-01 03:56:10 UTC (rev 211467)
+++ trunk/Source/WebKit/mac/DOM/DOMPrivate.h 2017-02-01 05:34:31 UTC (rev 211468)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKitLegacy/DOM.h>
</span><span class="cx"> #import <WebKitLegacy/WebAutocapitalizeTypes.h>
</span><ins>+#import <WebKitLegacy/WebDOMOperationsPrivate.h>
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> #import <CoreText/CoreText.h>
</span><span class="lines">@@ -95,15 +96,8 @@
</span><span class="cx"> - (DOMHTMLTableCellElement *)_cellAbove;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-// All the methods in this category are used by Safari forms autofill and should not be used for any other purpose.
-// Each one should eventually be replaced by public DOM API, and when that happens Safari will switch to implementations
-// using that public API, and these will be deleted.
</del><span class="cx"> @interface DOMHTMLInputElement (FormAutoFillTransition)
</span><span class="cx"> - (BOOL)_isTextField;
</span><del>-#if TARGET_OS_IPHONE
-- (BOOL)_isAutofilled;
-- (void)_setAutofilled:(BOOL)filled;
-#endif
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="lines">@@ -118,10 +112,6 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif // TARGET_OS_IPHONE
</span><span class="cx">
</span><del>-// All the methods in this category are used by Safari forms autofill and should not be used for any other purpose.
-// They are stopgap measures until we finish transitioning form controls to not use NSView. Each one should become
-// replaceable by public DOM API, and when that happens Safari will switch to implementations using that public API,
-// and these will be deleted.
</del><span class="cx"> @interface DOMHTMLSelectElement (FormAutoFillTransition)
</span><span class="cx"> - (void)_activateItemAtIndex:(int)index;
</span><span class="cx"> - (void)_activateItemAtIndex:(int)index allowMultipleSelection:(BOOL)allowMultipleSelection;
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMWebDOMOperationsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm (211467 => 211468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm 2017-02-01 03:56:10 UTC (rev 211467)
+++ trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm 2017-02-01 05:34:31 UTC (rev 211468)
</span><span class="lines">@@ -212,6 +212,11 @@
</span><span class="cx">
</span><span class="cx"> @implementation DOMHTMLInputElement (WebDOMHTMLInputElementOperationsPrivate)
</span><span class="cx">
</span><ins>+- (BOOL)_isAutofilled
+{
+ return downcast<HTMLInputElement>(core((DOMElement *)self))->isAutoFilled();
+}
+
</ins><span class="cx"> - (void)_setAutofilled:(BOOL)autofilled
</span><span class="cx"> {
</span><span class="cx"> downcast<HTMLInputElement>(core((DOMElement *)self))->setAutoFilled(autofilled);
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMWebDOMOperationsPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h (211467 => 211468)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h 2017-02-01 03:56:10 UTC (rev 211467)
+++ trunk/Source/WebKit/mac/DOM/WebDOMOperationsPrivate.h 2017-02-01 05:34:31 UTC (rev 211468)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMHTMLInputElement (WebDOMHTMLInputElementOperationsPrivate)
</span><ins>+- (BOOL)_isAutofilled;
</ins><span class="cx"> - (void)_setAutofilled:(BOOL)autofilled;
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>