<!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>[161037] trunk/Source/WebCore</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/161037">161037</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-23 16:48:29 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove boolean argument from Element::setChildrenAffectBy* methods
https://bugs.webkit.org/show_bug.cgi?id=126183
Reviewed by Daniel Bates.
Merge https://chromium.googlesource.com/chromium/blink/+/066ef2fa78336b2b65052cb17cb81b367fe7dbbf
These functions are never called with false.
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOne):
* dom/Element.cpp:
(WebCore::Element::setChildrenAffectedByActive):
(WebCore::Element::setChildrenAffectedByDrag):
* dom/Element.h:
(WebCore::Element::setChildrenAffectedByHover):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161036 => 161037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-24 00:25:14 UTC (rev 161036)
+++ trunk/Source/WebCore/ChangeLog 2013-12-24 00:48:29 UTC (rev 161037)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-23 Ryosuke Niwa <rniwa@webkit.org>
+
+ Remove boolean argument from Element::setChildrenAffectBy* methods
+ https://bugs.webkit.org/show_bug.cgi?id=126183
+
+ Reviewed by Daniel Bates.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/066ef2fa78336b2b65052cb17cb81b367fe7dbbf
+
+ These functions are never called with false.
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::checkOne):
+ * dom/Element.cpp:
+ (WebCore::Element::setChildrenAffectedByActive):
+ (WebCore::Element::setChildrenAffectedByDrag):
+ * dom/Element.h:
+ (WebCore::Element::setChildrenAffectedByHover):
+
</ins><span class="cx"> 2013-12-23 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the iOS build after r161013 and r160672.
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (161036 => 161037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2013-12-24 00:25:14 UTC (rev 161036)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2013-12-24 00:48:29 UTC (rev 161037)
</span><span class="lines">@@ -605,7 +605,7 @@
</span><span class="cx"> if (context.elementStyle)
</span><span class="cx"> context.elementStyle->setAffectedByDrag();
</span><span class="cx"> else
</span><del>- element->setChildrenAffectedByDrag(true);
</del><ins>+ element->setChildrenAffectedByDrag();
</ins><span class="cx"> }
</span><span class="cx"> if (element->renderer() && element->renderer()->isDragging())
</span><span class="cx"> return true;
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> if (context.elementStyle)
</span><span class="cx"> context.elementStyle->setAffectedByHover();
</span><span class="cx"> else
</span><del>- element->setChildrenAffectedByHover(true);
</del><ins>+ element->setChildrenAffectedByHover();
</ins><span class="cx"> }
</span><span class="cx"> if (element->hovered() || InspectorInstrumentation::forcePseudoState(element, CSSSelector::PseudoHover))
</span><span class="cx"> return true;
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx"> if (context.elementStyle)
</span><span class="cx"> context.elementStyle->setAffectedByActive();
</span><span class="cx"> else
</span><del>- element->setChildrenAffectedByActive(true);
</del><ins>+ element->setChildrenAffectedByActive();
</ins><span class="cx"> }
</span><span class="cx"> if (element->active() || InspectorInstrumentation::forcePseudoState(element, CSSSelector::PseudoActive))
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (161036 => 161037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2013-12-24 00:25:14 UTC (rev 161036)
+++ trunk/Source/WebCore/dom/Element.cpp 2013-12-24 00:48:29 UTC (rev 161037)
</span><span class="lines">@@ -2165,16 +2165,14 @@
</span><span class="cx"> ensureElementRareData().setStyleAffectedByEmpty(true);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::setChildrenAffectedByActive(bool value)
</del><ins>+void Element::setChildrenAffectedByActive()
</ins><span class="cx"> {
</span><del>- if (value || hasRareData())
- ensureElementRareData().setChildrenAffectedByActive(value);
</del><ins>+ ensureElementRareData().setChildrenAffectedByActive(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Element::setChildrenAffectedByDrag(bool value)
</del><ins>+void Element::setChildrenAffectedByDrag()
</ins><span class="cx"> {
</span><del>- if (value || hasRareData())
- ensureElementRareData().setChildrenAffectedByDrag(value);
</del><ins>+ ensureElementRareData().setChildrenAffectedByDrag(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::setChildrenAffectedByDirectAdjacentRules(Element* element)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (161036 => 161037)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2013-12-24 00:25:14 UTC (rev 161036)
+++ trunk/Source/WebCore/dom/Element.h 2013-12-24 00:48:29 UTC (rev 161037)
</span><span class="lines">@@ -362,9 +362,9 @@
</span><span class="cx"> bool hasFlagsSetDuringStylingOfChildren() const;
</span><span class="cx">
</span><span class="cx"> void setStyleAffectedByEmpty();
</span><del>- void setChildrenAffectedByHover(bool flag) { setFlag(flag, ChildrenAffectedByHoverRulesFlag); }
- void setChildrenAffectedByActive(bool);
- void setChildrenAffectedByDrag(bool);
</del><ins>+ void setChildrenAffectedByHover() { setFlag(ChildrenAffectedByHoverRulesFlag); }
+ void setChildrenAffectedByActive();
+ void setChildrenAffectedByDrag();
</ins><span class="cx"> void setChildrenAffectedByFirstChildRules() { setFlag(ChildrenAffectedByFirstChildRulesFlag); }
</span><span class="cx"> void setChildrenAffectedByLastChildRules() { setFlag(ChildrenAffectedByLastChildRulesFlag); }
</span><span class="cx"> static void setChildrenAffectedByDirectAdjacentRules(Element*);
</span></span></pre>
</div>
</div>
</body>
</html>