Changeset 283441 in webkit

Timestamp:

Oct 2, 2021, 6:40:20 AM (5 years ago)

Author:

cathiechen

Message:

[Performance] Optimize RenderLayer::establishesTopLayer
​https://bugs.webkit.org/show_bug.cgi?id=231016

Reviewed by Simon Fraser.

This patch added isInTopLayerOrBackdrop to reduce the times of calling renderer().element() in RenderLayer::establishesTopLayer.
And isInTopLayerOrBackdrop can be shared in Adjuster.

• dom/Element.h:

(WebCore::isInTopLayerOrBackdrop):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::establishesTopLayer const):

• style/StyleAdjuster.cpp:

(WebCore::Style::Adjuster::adjust const):
(WebCore::Style::Adjuster::adjustDisplayContentsStyle const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.h (modified) (2 diffs)
• rendering/RenderLayer.cpp (modified) (1 diff)
• style/StyleAdjuster.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-02  Cathie Chen  <cathiechen@igalia.com>
+
+        [Performance] Optimize RenderLayer::establishesTopLayer
+        https://bugs.webkit.org/show_bug.cgi?id=231016
+
+        Reviewed by Simon Fraser.
+
+        This patch added isInTopLayerOrBackdrop to reduce the times of calling renderer().element() in RenderLayer::establishesTopLayer.
+        And isInTopLayerOrBackdrop can be shared in Adjuster.
+
+        * dom/Element.h:
+        (WebCore::isInTopLayerOrBackdrop):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::establishesTopLayer const):
+        * style/StyleAdjuster.cpp:
+        (WebCore::Style::Adjuster::adjust const):
+        (WebCore::Style::Adjuster::adjustDisplayContentsStyle const):
+
 2021-10-02  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/dom/Element.h

@@ -30 +30 @@
 #include "FocusOptions.h"
 #include "HTMLNames.h"
+#include "RenderStyle.h"
 #include "ScrollTypes.h"
 #include "ShadowRootInit.h"
@@ -872 +873 @@
 }
 
+inline bool isInTopLayerOrBackdrop(const RenderStyle& style, const Element* element)
+{
+    return (element && element->isInTopLayer()) || style.styleType() == PseudoId::Backdrop;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3982 +3982 @@
 bool RenderLayer::establishesTopLayer() const
 {
-    if (!renderer().element())
-        return renderer().style().styleType() == PseudoId::Backdrop;
-
-    return renderer().element()->isInTopLayer();
+    return isInTopLayerOrBackdrop(renderer().style(), renderer().element());
 }
 

trunk/Source/WebCore/style/StyleAdjuster.cpp

@@ -317 +317 @@
         // Top layer elements are always position: absolute; unless the position is set to fixed.
         // https://fullscreen.spec.whatwg.org/#new-stacking-layer
-        bool isInTopLayer = style.styleType() == PseudoId::Backdrop || (m_element && m_element->isInTopLayer());
+        bool isInTopLayer = isInTopLayerOrBackdrop(style, m_element);
         if (style.position() != PositionType::Absolute && style.position() != PositionType::Fixed && isInTopLayer)
             style.setPosition(PositionType::Absolute);
@@ -597 +597 @@
 void Adjuster::adjustDisplayContentsStyle(RenderStyle& style) const
 {
-    bool isInTopLayer = style.styleType() == PseudoId::Backdrop || (m_element && m_element->isInTopLayer());
+    bool isInTopLayer = isInTopLayerOrBackdrop(style, m_element);
     if (isInTopLayer || m_document.documentElement() == m_element) {
         style.setEffectiveDisplay(DisplayType::Block);