Title: [161037] trunk/Source/WebCore
- Revision
- 161037
- Author
- [email protected]
- Date
- 2013-12-23 16:48:29 -0800 (Mon, 23 Dec 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161036 => 161037)
--- 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)
@@ -1,3 +1,22 @@
+2013-12-23 Ryosuke Niwa <[email protected]>
+
+ 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):
+
2013-12-23 Tim Horton <[email protected]>
Fix the iOS build after r161013 and r160672.
Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (161036 => 161037)
--- 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)
@@ -605,7 +605,7 @@
if (context.elementStyle)
context.elementStyle->setAffectedByDrag();
else
- element->setChildrenAffectedByDrag(true);
+ element->setChildrenAffectedByDrag();
}
if (element->renderer() && element->renderer()->isDragging())
return true;
@@ -620,7 +620,7 @@
if (context.elementStyle)
context.elementStyle->setAffectedByHover();
else
- element->setChildrenAffectedByHover(true);
+ element->setChildrenAffectedByHover();
}
if (element->hovered() || InspectorInstrumentation::forcePseudoState(element, CSSSelector::PseudoHover))
return true;
@@ -634,7 +634,7 @@
if (context.elementStyle)
context.elementStyle->setAffectedByActive();
else
- element->setChildrenAffectedByActive(true);
+ element->setChildrenAffectedByActive();
}
if (element->active() || InspectorInstrumentation::forcePseudoState(element, CSSSelector::PseudoActive))
return true;
Modified: trunk/Source/WebCore/dom/Element.cpp (161036 => 161037)
--- 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)
@@ -2165,16 +2165,14 @@
ensureElementRareData().setStyleAffectedByEmpty(true);
}
-void Element::setChildrenAffectedByActive(bool value)
+void Element::setChildrenAffectedByActive()
{
- if (value || hasRareData())
- ensureElementRareData().setChildrenAffectedByActive(value);
+ ensureElementRareData().setChildrenAffectedByActive(true);
}
-void Element::setChildrenAffectedByDrag(bool value)
+void Element::setChildrenAffectedByDrag()
{
- if (value || hasRareData())
- ensureElementRareData().setChildrenAffectedByDrag(value);
+ ensureElementRareData().setChildrenAffectedByDrag(true);
}
void Element::setChildrenAffectedByDirectAdjacentRules(Element* element)
Modified: trunk/Source/WebCore/dom/Element.h (161036 => 161037)
--- 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)
@@ -362,9 +362,9 @@
bool hasFlagsSetDuringStylingOfChildren() const;
void setStyleAffectedByEmpty();
- void setChildrenAffectedByHover(bool flag) { setFlag(flag, ChildrenAffectedByHoverRulesFlag); }
- void setChildrenAffectedByActive(bool);
- void setChildrenAffectedByDrag(bool);
+ void setChildrenAffectedByHover() { setFlag(ChildrenAffectedByHoverRulesFlag); }
+ void setChildrenAffectedByActive();
+ void setChildrenAffectedByDrag();
void setChildrenAffectedByFirstChildRules() { setFlag(ChildrenAffectedByFirstChildRulesFlag); }
void setChildrenAffectedByLastChildRules() { setFlag(ChildrenAffectedByLastChildRulesFlag); }
static void setChildrenAffectedByDirectAdjacentRules(Element*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
