Diff
Modified: trunk/Source/WebCore/ChangeLog (209985 => 209986)
--- 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)
@@ -1,3 +1,34 @@
+2016-12-19 Antti Koivisto <an...@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.
+
2016-12-19 Zan Dobersek <zdober...@igalia.com>
[EME] Remove MediaKeySessionType::persistent-usage-record
Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp (209985 => 209986)
--- 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)
@@ -53,7 +53,6 @@
LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
const char* renderName() const override { return "RenderImageControlsButton"; }
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
};
RenderImageControlsButton::RenderImageControlsButton(HTMLElement& element, RenderStyle&& style)
Modified: trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp (209985 => 209986)
--- 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)
@@ -46,7 +46,6 @@
LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
const char* renderName() const override { return "RenderImageControls"; }
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
};
RenderImageControls::RenderImageControls(HTMLElement& element, RenderStyle&& style)
Modified: trunk/Source/WebCore/rendering/RenderButton.h (209985 => 209986)
--- 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)
@@ -71,8 +71,6 @@
bool hasLineIfEmpty() const override;
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
bool isFlexibleBoxImpl() const override { return true; }
RenderTextFragment* m_buttonText;
Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.h (209985 => 209986)
--- 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)
@@ -52,8 +52,6 @@
void computePreferredLogicalWidths() override;
void paintObject(PaintInfo&, const LayoutPoint&) override;
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
int maxFilenameWidth() const;
VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) override;
Modified: trunk/Source/WebCore/rendering/RenderListItem.h (209985 => 209986)
--- 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)
@@ -73,8 +73,6 @@
void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
void addOverflowFromChildren() override;
void computePreferredLogicalWidths() override;
Modified: trunk/Source/WebCore/rendering/RenderMedia.h (209985 => 209986)
--- 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)
@@ -53,8 +53,6 @@
bool isImage() const final { return false; }
void paintReplaced(PaintInfo&, const LayoutPoint&) override;
- bool requiresForcedStyleRecalcPropagation() const final { return true; }
-
bool shadowControlsNeedCustomLayoutMetrics() const override { return true; }
void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
};
Modified: trunk/Source/WebCore/rendering/RenderMenuList.h (209985 => 209986)
--- 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)
@@ -81,8 +81,6 @@
void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
-
// PopupMenuClient methods
void valueChanged(unsigned listIndex, bool fireOnChange = true) override;
void selectionChanged(unsigned, bool) override { }
Modified: trunk/Source/WebCore/rendering/RenderMeter.h (209985 => 209986)
--- 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)
@@ -43,7 +43,6 @@
const char* renderName() const override { return "RenderMeter"; }
bool isMeter() const override { return true; }
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
};
} // namespace WebCore
Modified: trunk/Source/WebCore/rendering/RenderObject.h (209985 => 209986)
--- 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)
@@ -327,8 +327,6 @@
FlowThreadState flowThreadState() const { return m_bitfields.flowThreadState(); }
void setFlowThreadState(FlowThreadState state) { m_bitfields.setFlowThreadState(state); }
- virtual bool requiresForcedStyleRecalcPropagation() const { return false; }
-
#if ENABLE(MATHML)
virtual bool isRenderMathMLBlock() const { return false; }
virtual bool isRenderMathMLTable() const { return false; }
Modified: trunk/Source/WebCore/rendering/RenderProgress.h (209985 => 209986)
--- 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)
@@ -43,7 +43,6 @@
private:
const char* renderName() const override { return "RenderProgress"; }
bool isProgress() const override { return true; }
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
void animationTimerFired();
Modified: trunk/Source/WebCore/rendering/RenderSlider.h (209985 => 209986)
--- 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)
@@ -45,7 +45,6 @@
int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override;
void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
void computePreferredLogicalWidths() override;
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
void layout() override;
bool isFlexibleBoxImpl() const override { return true; }
Modified: trunk/Source/WebCore/rendering/RenderTextControl.h (209985 => 209986)
--- 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)
@@ -80,8 +80,6 @@
void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override;
bool canBeProgramaticallyScrolled() const override { return true; }
-
- bool requiresForcedStyleRecalcPropagation() const override { return true; }
};
// Renderer for our inner container, for <search> and others.
Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (209985 => 209986)
--- 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)
@@ -283,7 +283,7 @@
}
if (update.change == Style::NoChange) {
- if (pseudoStyleCacheIsInvalid(&renderer, update.style.get()) || (parent().styleChange == Style::Force && renderer.requiresForcedStyleRecalcPropagation())) {
+ if (pseudoStyleCacheIsInvalid(&renderer, update.style.get())) {
renderer.setStyle(RenderStyle::clone(*update.style), StyleDifferenceEqual);
return;
}
