Changeset 229091 in webkit

Timestamp:

Feb 28, 2018 8:31:34 AM (6 years ago)

Author:

Alan Bujtas

Message:

Remove RenderElement::s_affectsParentBlock
​https://bugs.webkit.org/show_bug.cgi?id=183187
<rdar://problem/37961079>

Reviewed by Antti Koivisto.

Remove the hack to track floating/out-of-flow changes between styleWillChange and styleDidChange.

Covered by existing tests.

• rendering/RenderElement.cpp:

(WebCore::RenderElement::styleWillChange):
(WebCore::RenderElement::styleDidChange):

• rendering/RenderElement.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (4 diffs)
• rendering/RenderElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-28  Zalan Bujtas  <zalan@apple.com>
+
+        Remove RenderElement::s_affectsParentBlock
+        https://bugs.webkit.org/show_bug.cgi?id=183187
+        <rdar://problem/37961079>
+
+        Reviewed by Antti Koivisto.
+
+        Remove the hack to track floating/out-of-flow changes between styleWillChange and styleDidChange.
+
+        Covered by existing tests.
+
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::styleWillChange):
+        (WebCore::RenderElement::styleDidChange):
+        * rendering/RenderElement.h:
+
 2018-02-28  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -95 +95 @@
 static_assert(sizeof(RenderElement) == sizeof(SameSizeAsRenderElement), "RenderElement should stay small");
 
-bool RenderElement::s_affectsParentBlock = false;
 bool RenderElement::s_noLongerAffectsParentBlock = false;
     
@@ -750 +749 @@
         }
 
-        s_affectsParentBlock = isFloatingOrOutOfFlowPositioned()
-            && (!newStyle.isFloating() && !newStyle.hasOutOfFlowPosition())
-            && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderInline());
-
         s_noLongerAffectsParentBlock = ((!isFloating() && newStyle.isFloating()) || (!isOutOfFlowPositioned() && newStyle.hasOutOfFlowPosition()))
             && parent() && parent()->isRenderBlock();
@@ -770 +765 @@
         setHasTransformRelatedProperty(false);
         setHasReflection(false);
-    } else {
-        s_affectsParentBlock = false;
+    } else
         s_noLongerAffectsParentBlock = false;
-    }
 
     bool newStyleSlowScroll = false;
@@ -814 +807 @@
     updateShapeImage(oldStyle ? oldStyle->shapeOutside() : nullptr, m_style.shapeOutside());
 
-    if (s_affectsParentBlock) {
+    bool affectsParentBlock = oldStyle && (oldStyle->isFloating() || oldStyle->hasOutOfFlowPosition())
+        && !style().isFloating() && !style().hasOutOfFlowPosition()
+        && parent() && (parent()->isRenderBlockFlow() || parent()->isRenderInline());
+    if (affectsParentBlock) {
         // We have gone from not affecting the inline status of the parent flow to suddenly
         // having an impact. See if there is a mismatch between the parent flow's

trunk/Source/WebCore/rendering/RenderElement.h

@@ -352 +352 @@
     // FIXME: Get rid of this hack.
     // Store state between styleWillChange and styleDidChange
-    static bool s_affectsParentBlock;
     static bool s_noLongerAffectsParentBlock;
 };