Changeset 208971 in webkit

Timestamp:

Nov 24, 2016 4:54:00 AM (7 years ago)

Author:

Antti Koivisto

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (1 diff)
• dom/Element.h (modified) (1 diff)
• html/HTMLFrameSetElement.cpp (modified) (1 diff)
• html/HTMLFrameSetElement.h (modified) (1 diff)
• html/HTMLPlugInImageElement.cpp (modified) (2 diffs)
• html/HTMLPlugInImageElement.h (modified) (1 diff)
• style/StyleTreeResolver.cpp (modified) (1 diff)
• svg/SVGElement.cpp (modified) (1 diff)
• svg/SVGElement.h (modified) (1 diff)
• svg/SVGUseElement.cpp (modified) (1 diff)
• svg/SVGUseElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2016-11-22  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -3464 +3464 @@
 }
 
-bool Element::willRecalcStyle(Style::Change)
+void Element::willRecalcStyle(Style::Change)
 {
     ASSERT(hasCustomStyleResolveCallbacks());
-    return true;
 }
 

trunk/Source/WebCore/dom/Element.h

@@ -513 +513 @@
     WEBCORE_EXPORT bool dispatchMouseForceWillBegin();
 
-    virtual bool willRecalcStyle(Style::Change);
+    virtual void willRecalcStyle(Style::Change);
     virtual void didRecalcStyle(Style::Change);
     virtual void willResetComputedStyle();

trunk/Source/WebCore/html/HTMLFrameSetElement.cpp

@@ -201 +201 @@
 }
 
-bool HTMLFrameSetElement::willRecalcStyle(Style::Change)
+void HTMLFrameSetElement::willRecalcStyle(Style::Change)
 {
     if (needsStyleRecalc() && renderer())
         renderer()->setNeedsLayout();
-    return true;
 }
 

trunk/Source/WebCore/html/HTMLFrameSetElement.h

@@ -60 +60 @@
     void defaultEventHandler(Event&) final;
 
-    bool willRecalcStyle(Style::Change) final;
+    void willRecalcStyle(Style::Change) final;
 
     InsertionNotificationRequest insertedInto(ContainerNode&) final;

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -237 +237 @@
 }
 
-bool HTMLPlugInImageElement::willRecalcStyle(Style::Change change)
+void HTMLPlugInImageElement::willRecalcStyle(Style::Change change)
 {
     // Make sure style recalcs scheduled by a child shadow tree don't trigger reconstruction and cause flicker.
     if (change == Style::NoChange && styleValidity() == Style::Validity::Valid)
-        return true;
+        return;
 
     // FIXME: There shoudn't be need to force render tree reconstruction here.
@@ -247 +247 @@
     if (!useFallbackContent() && needsWidgetUpdate() && renderer() && !isImageType() && (displayState() != DisplayingSnapshot))
         invalidateStyleAndRenderersForSubtree();
-    return true;
 }
 

trunk/Source/WebCore/html/HTMLPlugInImageElement.h

@@ -118 +118 @@
     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
     bool childShouldCreateRenderer(const Node&) const override;
-    bool willRecalcStyle(Style::Change) final;
+    void willRecalcStyle(Style::Change) final;
     void didAttachRenderers() final;
     void willDetachRenderers() final;

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -407 +407 @@
             element.resetComputedStyle();
 
-            if (element.hasCustomStyleResolveCallbacks()) {
-                if (!element.willRecalcStyle(parent.change)) {
-                    it.traverseNextSkippingChildren();
-                    continue;
-                }
-            }
+            if (element.hasCustomStyleResolveCallbacks())
+                element.willRecalcStyle(parent.change);
 
             auto elementUpdate = resolveElement(element);

trunk/Source/WebCore/svg/SVGElement.cpp

@@ -300 +300 @@
 }
 
-bool SVGElement::willRecalcStyle(Style::Change change)
+void SVGElement::willRecalcStyle(Style::Change change)
 {
     if (!m_svgRareData || styleResolutionShouldRecompositeLayer())
-        return true;
+        return;
     // If the style changes because of a regular property change (not induced by SMIL animations themselves)
     // reset the "computed style without SMIL style properties", so the base value change gets reflected.
     if (change > Style::NoChange || needsStyleRecalc())
         m_svgRareData->setNeedsOverrideComputedStyleUpdate();
-    return true;
 }
 

trunk/Source/WebCore/svg/SVGElement.h

@@ -171 +171 @@
     void updateRelativeLengthsInformation(bool hasRelativeLengths, SVGElement*);
 
-    bool willRecalcStyle(Style::Change) override;
+    void willRecalcStyle(Style::Change) override;
 
     class InstanceInvalidationGuard;

trunk/Source/WebCore/svg/SVGUseElement.cpp

@@ -180 +180 @@
 }
 
-bool SVGUseElement::willRecalcStyle(Style::Change change)
+void SVGUseElement::willRecalcStyle(Style::Change change)
 {
     // FIXME: Shadow tree should be updated before style recalc.
     if (m_shadowTreeNeedsUpdate)
         updateShadowTree();
-    return SVGGraphicsElement::willRecalcStyle(change);
+    SVGGraphicsElement::willRecalcStyle(change);
 }
 

trunk/Source/WebCore/svg/SVGUseElement.h

@@ -63 +63 @@
     void parseAttribute(const QualifiedName&, const AtomicString&) override;
     void svgAttributeChanged(const QualifiedName&) override;
-    bool willRecalcStyle(Style::Change) override;
+    void willRecalcStyle(Style::Change) override;
     RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) override;
     void toClipPath(Path&) override;