Changeset 223194 in webkit

Timestamp:

Oct 11, 2017 11:32:58 AM (7 years ago)

Author:

Antti Koivisto

Message:

Remove some obsolete layout assertions
​https://bugs.webkit.org/show_bug.cgi?id=178170

Reviewed by Zalan Bujtas.

We have strong assertions against render tree mutation functions being called in layout. These are unnecessary.

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::moveChildTo):

• rendering/RenderElement.cpp:

(WebCore::RenderElement::takeChildInternal):

• rendering/RenderElement.h:
• rendering/RenderListItem.cpp:

(WebCore::RenderListItem::layout):

• rendering/RenderListItem.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderElement.cpp (modified) (2 diffs)
• rendering/RenderElement.h (modified) (1 diff)
• rendering/RenderListItem.cpp (modified) (1 diff)
• rendering/RenderListItem.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-11  Antti Koivisto  <antti@apple.com>
+
+        Remove some obsolete layout assertions
+        https://bugs.webkit.org/show_bug.cgi?id=178170
+
+        Reviewed by Zalan Bujtas.
+
+        We have strong assertions against render tree mutation functions being called in layout. These are unnecessary.
+
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::moveChildTo):
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::takeChildInternal):
+        * rendering/RenderElement.h:
+        * rendering/RenderListItem.cpp:
+        (WebCore::RenderListItem::layout):
+        * rendering/RenderListItem.h:
+
 2017-10-11  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2586 +2586 @@
 void RenderBoxModelObject::moveChildTo(RenderBoxModelObject* toBoxModelObject, RenderObject* child, RenderObject* beforeChild, bool fullRemoveInsert)
 {
-#if !ASSERT_DISABLED
-    SetForScope<bool> reparentingChild(m_reparentingChild, true);
-#endif
     // We assume that callers have cleared their positioned objects list for child moves (!fullRemoveInsert) so the
     // positioned renderer maps don't become stale. It would be too slow to do the map lookup on each call.

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -86 +86 @@
     void* lastChild;
     RenderStyle style;
-#if !ASSERT_DISABLED
-    bool reparentingChild;
-#endif
 };
 
@@ -635 +632 @@
     if (AXObjectCache* cache = document().existingAXObjectCache())
         cache->childrenChanged(this);
-#if !ASSERT_DISABLED
-    // Check if the marker gets detached while laying out the list item.
-    if (is<RenderListMarker>(oldChild))
-        ASSERT(m_reparentingChild || !downcast<RenderListMarker>(oldChild).listItem().inLayout());
-#endif
 
     return RenderPtr<RenderObject>(&oldChild);

trunk/Source/WebCore/rendering/RenderElement.h

@@ -359 +359 @@
     static bool s_affectsParentBlock;
     static bool s_noLongerAffectsParentBlock;
-
-protected:
-#if !ASSERT_DISABLED
-    bool m_reparentingChild { false };
-#endif
 };
 

trunk/Source/WebCore/rendering/RenderListItem.cpp

@@ -235 +235 @@
     ASSERT(needsLayout());
 
-#if !ASSERT_DISABLED
-    SetForScope<bool> inListItemLayout(m_inLayout, true);
-#endif
     RenderBlockFlow::layout();
 }

trunk/Source/WebCore/rendering/RenderListItem.h

@@ -60 +60 @@
     void setMarkerRenderer(RenderListMarker& marker) { m_marker = makeWeakPtr(marker); }
 
-#if !ASSERT_DISABLED
-    bool inLayout() const { return m_inLayout; }
-#endif
-
 private:
     void willBeDestroyed() override;
@@ -91 +87 @@
     WeakPtr<RenderListMarker> m_marker;
     mutable int m_value;
-#if !ASSERT_DISABLED
-    bool m_inLayout { false };
-#endif
     bool m_hasExplicitValue : 1;
     mutable bool m_isValueUpToDate : 1;