<!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>[208971] 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/208971">208971</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-11-24 04:54:00 -0800 (Thu, 24 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused bool return from Element::willRecalcStyle
https://bugs.webkit.org/show_bug.cgi?id=165059
Reviewed by Andreas Kling.
It is always true.
* dom/Element.cpp:
(WebCore::Element::willRecalcStyle):
* dom/Element.h:
* html/HTMLFrameSetElement.cpp:
(WebCore::HTMLFrameSetElement::willRecalcStyle):
* html/HTMLFrameSetElement.h:
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::willRecalcStyle):
* html/HTMLPlugInImageElement.h:
* style/StyleTreeResolver.cpp:
(WebCore::Style::TreeResolver::resolveComposedTree):
* svg/SVGElement.cpp:
(WebCore::SVGElement::willRecalcStyle):
* svg/SVGElement.h:
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::willRecalcStyle):
* svg/SVGUseElement.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameSetElementcpp">trunk/Source/WebCore/html/HTMLFrameSetElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLFrameSetElementh">trunk/Source/WebCore/html/HTMLFrameSetElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementh">trunk/Source/WebCore/html/HTMLPlugInImageElement.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementh">trunk/Source/WebCore/svg/SVGUseElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/ChangeLog 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-11-24 Antti Koivisto <antti@apple.com>
+
+ Remove unused bool return from Element::willRecalcStyle
+ https://bugs.webkit.org/show_bug.cgi?id=165059
+
+ Reviewed by Andreas Kling.
+
+ It is always true.
+
+ * dom/Element.cpp:
+ (WebCore::Element::willRecalcStyle):
+ * dom/Element.h:
+ * html/HTMLFrameSetElement.cpp:
+ (WebCore::HTMLFrameSetElement::willRecalcStyle):
+ * html/HTMLFrameSetElement.h:
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::willRecalcStyle):
+ * html/HTMLPlugInImageElement.h:
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::TreeResolver::resolveComposedTree):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::willRecalcStyle):
+ * svg/SVGElement.h:
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::willRecalcStyle):
+ * svg/SVGUseElement.h:
+
</ins><span class="cx"> 2016-11-22 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::ExtensionStyleSheets::pageUserSheet + 14
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -3463,10 +3463,9 @@
</span><span class="cx"> document().userActionElements().didDetach(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Element::willRecalcStyle(Style::Change)
</del><ins>+void Element::willRecalcStyle(Style::Change)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(hasCustomStyleResolveCallbacks());
</span><del>- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::didRecalcStyle(Style::Change)
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/dom/Element.h 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool dispatchMouseForceWillBegin();
</span><span class="cx">
</span><del>- virtual bool willRecalcStyle(Style::Change);
</del><ins>+ virtual void willRecalcStyle(Style::Change);
</ins><span class="cx"> virtual void didRecalcStyle(Style::Change);
</span><span class="cx"> virtual void willResetComputedStyle();
</span><span class="cx"> virtual void willAttachRenderers();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameSetElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameSetElement.cpp (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameSetElement.cpp 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/html/HTMLFrameSetElement.cpp 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -200,11 +200,10 @@
</span><span class="cx"> HTMLElement::defaultEventHandler(event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLFrameSetElement::willRecalcStyle(Style::Change)
</del><ins>+void HTMLFrameSetElement::willRecalcStyle(Style::Change)
</ins><span class="cx"> {
</span><span class="cx"> if (needsStyleRecalc() && renderer())
</span><span class="cx"> renderer()->setNeedsLayout();
</span><del>- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node::InsertionNotificationRequest HTMLFrameSetElement::insertedInto(ContainerNode& insertionPoint)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLFrameSetElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLFrameSetElement.h (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLFrameSetElement.h 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/html/HTMLFrameSetElement.h 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> void defaultEventHandler(Event&) final;
</span><span class="cx">
</span><del>- bool willRecalcStyle(Style::Change) final;
</del><ins>+ void willRecalcStyle(Style::Change) final;
</ins><span class="cx">
</span><span class="cx"> InsertionNotificationRequest insertedInto(ContainerNode&) final;
</span><span class="cx"> void removedFrom(ContainerNode&) final;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -236,17 +236,16 @@
</span><span class="cx"> return HTMLPlugInElement::childShouldCreateRenderer(child);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool HTMLPlugInImageElement::willRecalcStyle(Style::Change change)
</del><ins>+void HTMLPlugInImageElement::willRecalcStyle(Style::Change change)
</ins><span class="cx"> {
</span><span class="cx"> // Make sure style recalcs scheduled by a child shadow tree don't trigger reconstruction and cause flicker.
</span><span class="cx"> if (change == Style::NoChange && styleValidity() == Style::Validity::Valid)
</span><del>- return true;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> // FIXME: There shoudn't be need to force render tree reconstruction here.
</span><span class="cx"> // It is only done because loading and load event dispatching is tied to render tree construction.
</span><span class="cx"> if (!useFallbackContent() && needsWidgetUpdate() && renderer() && !isImageType() && (displayState() != DisplayingSnapshot))
</span><span class="cx"> invalidateStyleAndRenderersForSubtree();
</span><del>- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLPlugInImageElement::didAttachRenderers()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.h (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.h 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><span class="cx"> bool childShouldCreateRenderer(const Node&) const override;
</span><del>- bool willRecalcStyle(Style::Change) final;
</del><ins>+ void willRecalcStyle(Style::Change) final;
</ins><span class="cx"> void didAttachRenderers() final;
</span><span class="cx"> void willDetachRenderers() final;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -406,12 +406,8 @@
</span><span class="cx"> if (shouldResolve) {
</span><span class="cx"> element.resetComputedStyle();
</span><span class="cx">
</span><del>- if (element.hasCustomStyleResolveCallbacks()) {
- if (!element.willRecalcStyle(parent.change)) {
- it.traverseNextSkippingChildren();
- continue;
- }
- }
</del><ins>+ if (element.hasCustomStyleResolveCallbacks())
+ element.willRecalcStyle(parent.change);
</ins><span class="cx">
</span><span class="cx"> auto elementUpdate = resolveElement(element);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -299,15 +299,14 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGElement::willRecalcStyle(Style::Change change)
</del><ins>+void SVGElement::willRecalcStyle(Style::Change change)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_svgRareData || styleResolutionShouldRecompositeLayer())
</span><del>- return true;
</del><ins>+ return;
</ins><span class="cx"> // If the style changes because of a regular property change (not induced by SMIL animations themselves)
</span><span class="cx"> // reset the "computed style without SMIL style properties", so the base value change gets reflected.
</span><span class="cx"> if (change > Style::NoChange || needsStyleRecalc())
</span><span class="cx"> m_svgRareData->setNeedsOverrideComputedStyleUpdate();
</span><del>- return true;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SVGElementRareData& SVGElement::ensureSVGRareData()
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/svg/SVGElement.h 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> void updateRelativeLengthsInformation() { updateRelativeLengthsInformation(selfHasRelativeLengths(), this); }
</span><span class="cx"> void updateRelativeLengthsInformation(bool hasRelativeLengths, SVGElement*);
</span><span class="cx">
</span><del>- bool willRecalcStyle(Style::Change) override;
</del><ins>+ void willRecalcStyle(Style::Change) override;
</ins><span class="cx">
</span><span class="cx"> class InstanceInvalidationGuard;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -179,12 +179,12 @@
</span><span class="cx"> SVGGraphicsElement::svgAttributeChanged(attrName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGUseElement::willRecalcStyle(Style::Change change)
</del><ins>+void SVGUseElement::willRecalcStyle(Style::Change change)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Shadow tree should be updated before style recalc.
</span><span class="cx"> if (m_shadowTreeNeedsUpdate)
</span><span class="cx"> updateShadowTree();
</span><del>- return SVGGraphicsElement::willRecalcStyle(change);
</del><ins>+ SVGGraphicsElement::willRecalcStyle(change);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static HashSet<AtomicString> createAllowedElementSet()
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.h (208970 => 208971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.h 2016-11-23 09:37:58 UTC (rev 208970)
+++ trunk/Source/WebCore/svg/SVGUseElement.h 2016-11-24 12:54:00 UTC (rev 208971)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> void buildPendingResource() override;
</span><span class="cx"> void parseAttribute(const QualifiedName&, const AtomicString&) override;
</span><span class="cx"> void svgAttributeChanged(const QualifiedName&) override;
</span><del>- bool willRecalcStyle(Style::Change) override;
</del><ins>+ void willRecalcStyle(Style::Change) override;
</ins><span class="cx"> RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
</span><span class="cx"> void toClipPath(Path&) override;
</span><span class="cx"> bool haveLoadedRequiredResources() override;
</span></span></pre>
</div>
</div>
</body>
</html>