Changeset 209986 in webkit


Ignore:
Timestamp:
Dec 19, 2016 9:37:11 AM (7 years ago)
Author:
Antti Koivisto
Message:

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.

Location:
trunk/Source/WebCore
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r209983 r209986  
     12016-12-19  Antti Koivisto  <antti@apple.com>
     2
     3        Remove RenderObject::requiresForcedStyleRecalcPropagation
     4        https://bugs.webkit.org/show_bug.cgi?id=166021
     5
     6        Reviewed by Andreas Kling.
     7
     8        It is not called. It also makes no sense architecturally.
     9
     10        * html/shadow/mac/ImageControlsButtonElementMac.cpp:
     11        * html/shadow/mac/ImageControlsRootElementMac.cpp:
     12        * rendering/RenderButton.h:
     13        * rendering/RenderFileUploadControl.h:
     14        * rendering/RenderListItem.h:
     15        * rendering/RenderMedia.h:
     16        * rendering/RenderMenuList.h:
     17        * rendering/RenderMeter.h:
     18        * rendering/RenderObject.h:
     19        (WebCore::RenderObject::requiresForcedStyleRecalcPropagation): Deleted.
     20        * rendering/RenderProgress.h:
     21        * rendering/RenderSlider.h:
     22        * rendering/RenderTextControl.h:
     23        * style/RenderTreeUpdater.cpp:
     24        (WebCore::RenderTreeUpdater::updateElementRenderer):
     25
     26            This is the only call site. Combination
     27
     28                update.change == Style::NoChange && parent().styleChange == Style::Force
     29
     30            is impossible ('Force' inherits) so requiresForcedStyleRecalcPropagation doesn't ever even get called.
     31
    1322016-12-19  Zan Dobersek  <zdobersek@igalia.com>
    233

  • trunk/Source/WebCore/html/shadow/mac/ImageControlsButtonElementMac.cpp

    r209903 r209986  
    5454
    5555    const char* renderName() const override { return "RenderImageControlsButton"; }
    56     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    5756};
    5857

  • trunk/Source/WebCore/html/shadow/mac/ImageControlsRootElementMac.cpp

    r209903 r209986  
    4747
    4848    const char* renderName() const override { return "RenderImageControls"; }
    49     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    5049};
    5150

  • trunk/Source/WebCore/rendering/RenderButton.h

    r208668 r209986  
    7272    bool hasLineIfEmpty() const override;
    7373
    74     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    75 
    7674    bool isFlexibleBoxImpl() const override { return true; }
    7775

  • trunk/Source/WebCore/rendering/RenderFileUploadControl.h

    r208668 r209986  
    5353    void paintObject(PaintInfo&, const LayoutPoint&) override;
    5454
    55     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    56 
    5755    int maxFilenameWidth() const;
    5856   

  • trunk/Source/WebCore/rendering/RenderListItem.h

    r208668 r209986  
    7474    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
    7575
    76     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    77 
    7876    void addOverflowFromChildren() override;
    7977    void computePreferredLogicalWidths() override;

  • trunk/Source/WebCore/rendering/RenderMedia.h

    r201588 r209986  
    5454    void paintReplaced(PaintInfo&, const LayoutPoint&) override;
    5555
    56     bool requiresForcedStyleRecalcPropagation() const final { return true; }
    57 
    5856    bool shadowControlsNeedCustomLayoutMetrics() const override { return true; }
    5957    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;

  • trunk/Source/WebCore/rendering/RenderMenuList.h

    r208985 r209986  
    8282    void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
    8383
    84     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    85 
    8684    // PopupMenuClient methods
    8785    void valueChanged(unsigned listIndex, bool fireOnChange = true) override;

  • trunk/Source/WebCore/rendering/RenderMeter.h

    r209903 r209986  
    4444    const char* renderName() const override { return "RenderMeter"; }
    4545    bool isMeter() const override { return true; }
    46     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    4746};
    4847

  • trunk/Source/WebCore/rendering/RenderObject.h

    r209411 r209986  
    327327    FlowThreadState flowThreadState() const { return m_bitfields.flowThreadState(); }
    328328    void setFlowThreadState(FlowThreadState state) { m_bitfields.setFlowThreadState(state); }
    329 
    330     virtual bool requiresForcedStyleRecalcPropagation() const { return false; }
    331329
    332330#if ENABLE(MATHML)

  • trunk/Source/WebCore/rendering/RenderProgress.h

    r209903 r209986  
    4444    const char* renderName() const override { return "RenderProgress"; }
    4545    bool isProgress() const override { return true; }
    46     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    4746    LogicalExtentComputedValues computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop) const override;
    4847

  • trunk/Source/WebCore/rendering/RenderSlider.h

    r208668 r209986  
    4646    void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
    4747    void computePreferredLogicalWidths() override;
    48     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    4948    void layout() override;
    5049

  • trunk/Source/WebCore/rendering/RenderTextControl.h

    r209903 r209986  
    8181
    8282    bool canBeProgramaticallyScrolled() const override { return true; }
    83 
    84     bool requiresForcedStyleRecalcPropagation() const override { return true; }
    8583};
    8684

  • trunk/Source/WebCore/style/RenderTreeUpdater.cpp

    r209802 r209986  
    284284
    285285    if (update.change == Style::NoChange) {
    286         if (pseudoStyleCacheIsInvalid(&renderer, update.style.get()) || (parent().styleChange == Style::Force && renderer.requiresForcedStyleRecalcPropagation())) {
     286        if (pseudoStyleCacheIsInvalid(&renderer, update.style.get())) {
    287287            renderer.setStyle(RenderStyle::clone(*update.style), StyleDifferenceEqual);
    288288            return;
Note: See TracChangeset for help on using the changeset viewer.