<!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>[209986] 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/209986">209986</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-12-19 09:37:11 -0800 (Mon, 19 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove RenderObject::requiresForcedStyleRecalcPropagation
https://bugs.webkit.org/show_bug.cgi?id=166021
Reviewed by Andreas Kling.
It is not called. It also makes no sense architecturally.
* html/shadow/mac/ImageControlsButtonElementMac.cpp:
* html/shadow/mac/ImageControlsRootElementMac.cpp:
* rendering/RenderButton.h:
* rendering/RenderFileUploadControl.h:
* rendering/RenderListItem.h:
* rendering/RenderMedia.h:
* rendering/RenderMenuList.h:
* rendering/RenderMeter.h:
* rendering/RenderObject.h:
(WebCore::RenderObject::requiresForcedStyleRecalcPropagation): Deleted.
* rendering/RenderProgress.h:
* rendering/RenderSlider.h:
* rendering/RenderTextControl.h:
* style/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::updateElementRenderer):
This is the only call site. Combination
update.change == Style::NoChange && parent().styleChange == Style::Force
is impossible ('Force' inherits) so requiresForcedStyleRecalcPropagation doesn't ever even get called.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp">trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowmacImageControlsRootElementMaccpp">trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderButtonh">trunk/Source/WebCore/rendering/RenderButton.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFileUploadControlh">trunk/Source/WebCore/rendering/RenderFileUploadControl.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListItemh">trunk/Source/WebCore/rendering/RenderListItem.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMediah">trunk/Source/WebCore/rendering/RenderMedia.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListh">trunk/Source/WebCore/rendering/RenderMenuList.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMeterh">trunk/Source/WebCore/rendering/RenderMeter.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderProgressh">trunk/Source/WebCore/rendering/RenderProgress.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSliderh">trunk/Source/WebCore/rendering/RenderSlider.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlh">trunk/Source/WebCore/rendering/RenderTextControl.h</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdatercpp">trunk/Source/WebCore/style/RenderTreeUpdater.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/ChangeLog 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-12-19 Antti Koivisto <antti@apple.com>
+
+ Remove RenderObject::requiresForcedStyleRecalcPropagation
+ https://bugs.webkit.org/show_bug.cgi?id=166021
+
+ Reviewed by Andreas Kling.
+
+ It is not called. It also makes no sense architecturally.
+
+ * html/shadow/mac/ImageControlsButtonElementMac.cpp:
+ * html/shadow/mac/ImageControlsRootElementMac.cpp:
+ * rendering/RenderButton.h:
+ * rendering/RenderFileUploadControl.h:
+ * rendering/RenderListItem.h:
+ * rendering/RenderMedia.h:
+ * rendering/RenderMenuList.h:
+ * rendering/RenderMeter.h:
+ * rendering/RenderObject.h:
+ (WebCore::RenderObject::requiresForcedStyleRecalcPropagation): Deleted.
+ * rendering/RenderProgress.h:
+ * rendering/RenderSlider.h:
+ * rendering/RenderTextControl.h:
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::RenderTreeUpdater::updateElementRenderer):
+
+ This is the only call site. Combination
+
+ update.change == Style::NoChange && parent().styleChange == Style::Force
+
+ is impossible ('Force' inherits) so requiresForcedStyleRecalcPropagation doesn't ever even get called.
+
</ins><span class="cx"> 2016-12-19 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [EME] Remove MediaKeySessionType::persistent-usage-record
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsButtonElementMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</span><span class="cx">
</span><span class="cx"> const char* renderName() const override { return "RenderImageControlsButton"; }
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RenderImageControlsButton::RenderImageControlsButton(HTMLElement& element, RenderStyle&& style)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowmacImageControlsRootElementMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</span><span class="cx">
</span><span class="cx"> const char* renderName() const override { return "RenderImageControls"; }
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RenderImageControls::RenderImageControls(HTMLElement& element, RenderStyle&& style)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderButtonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderButton.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderButton.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderButton.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -71,8 +71,6 @@
</span><span class="cx">
</span><span class="cx"> bool hasLineIfEmpty() const override;
</span><span class="cx">
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
</del><span class="cx"> bool isFlexibleBoxImpl() const override { return true; }
</span><span class="cx">
</span><span class="cx"> RenderTextFragment* m_buttonText;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFileUploadControlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFileUploadControl.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><span class="cx"> void paintObject(PaintInfo&, const LayoutPoint&) override;
</span><span class="cx">
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
</del><span class="cx"> int maxFilenameWidth() const;
</span><span class="cx">
</span><span class="cx"> VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListItem.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListItem.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderListItem.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -73,8 +73,6 @@
</span><span class="cx">
</span><span class="cx"> void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx">
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
</del><span class="cx"> void addOverflowFromChildren() override;
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMediah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMedia.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMedia.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderMedia.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx"> bool isImage() const final { return false; }
</span><span class="cx"> void paintReplaced(PaintInfo&, const LayoutPoint&) override;
</span><span class="cx">
</span><del>- bool requiresForcedStyleRecalcPropagation() const final { return true; }
-
</del><span class="cx"> bool shadowControlsNeedCustomLayoutMetrics() const override { return true; }
</span><span class="cx"> void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderMenuList.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -81,8 +81,6 @@
</span><span class="cx">
</span><span class="cx"> void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
</span><span class="cx">
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
</del><span class="cx"> // PopupMenuClient methods
</span><span class="cx"> void valueChanged(unsigned listIndex, bool fireOnChange = true) override;
</span><span class="cx"> void selectionChanged(unsigned, bool) override { }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMeterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMeter.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMeter.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderMeter.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx">
</span><span class="cx"> const char* renderName() const override { return "RenderMeter"; }
</span><span class="cx"> bool isMeter() const override { return true; }
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -327,8 +327,6 @@
</span><span class="cx"> FlowThreadState flowThreadState() const { return m_bitfields.flowThreadState(); }
</span><span class="cx"> void setFlowThreadState(FlowThreadState state) { m_bitfields.setFlowThreadState(state); }
</span><span class="cx">
</span><del>- virtual bool requiresForcedStyleRecalcPropagation() const { return false; }
-
</del><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> virtual bool isRenderMathMLBlock() const { return false; }
</span><span class="cx"> virtual bool isRenderMathMLTable() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderProgressh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderProgress.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderProgress.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderProgress.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> private:
</span><span class="cx"> const char* renderName() const override { return "RenderProgress"; }
</span><span class="cx"> bool isProgress() const override { return true; }
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
</del><span class="cx"> LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
</span><span class="cx">
</span><span class="cx"> void animationTimerFired();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSliderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSlider.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSlider.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderSlider.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
</span><span class="cx"> void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
</span><span class="cx"> void computePreferredLogicalWidths() override;
</span><del>- bool requiresForcedStyleRecalcPropagation() const override { return true; }
</del><span class="cx"> void layout() override;
</span><span class="cx">
</span><span class="cx"> bool isFlexibleBoxImpl() const override { return true; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.h 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/rendering/RenderTextControl.h 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -80,8 +80,6 @@
</span><span class="cx"> void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
</span><span class="cx">
</span><span class="cx"> bool canBeProgramaticallyScrolled() const override { return true; }
</span><del>-
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Renderer for our inner container, for <search> and others.
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (209985 => 209986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-12-19 17:31:55 UTC (rev 209985)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-12-19 17:37:11 UTC (rev 209986)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (update.change == Style::NoChange) {
</span><del>- if (pseudoStyleCacheIsInvalid(&renderer, update.style.get()) || (parent().styleChange == Style::Force && renderer.requiresForcedStyleRecalcPropagation())) {
</del><ins>+ if (pseudoStyleCacheIsInvalid(&renderer, update.style.get())) {
</ins><span class="cx"> renderer.setStyle(RenderStyle::clone(*update.style), StyleDifferenceEqual);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>