Title: [223194] trunk/Source/WebCore
- Revision
- 223194
- Author
- [email protected]
- Date
- 2017-10-11 11:32:58 -0700 (Wed, 11 Oct 2017)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223193 => 223194)
--- trunk/Source/WebCore/ChangeLog 2017-10-11 17:48:26 UTC (rev 223193)
+++ trunk/Source/WebCore/ChangeLog 2017-10-11 18:32:58 UTC (rev 223194)
@@ -1,3 +1,21 @@
+2017-10-11 Antti Koivisto <[email protected]>
+
+ 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 <[email protected]>
[Payment Request] Implement Apple Pay merchant validation
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (223193 => 223194)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2017-10-11 17:48:26 UTC (rev 223193)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2017-10-11 18:32:58 UTC (rev 223194)
@@ -2585,9 +2585,6 @@
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.
ASSERT(!fullRemoveInsert || !is<RenderBlock>(*this) || !downcast<RenderBlock>(*this).hasPositionedObjects());
Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (223193 => 223194)
--- trunk/Source/WebCore/rendering/RenderElement.cpp 2017-10-11 17:48:26 UTC (rev 223193)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2017-10-11 18:32:58 UTC (rev 223194)
@@ -85,9 +85,6 @@
void* firstChild;
void* lastChild;
RenderStyle style;
-#if !ASSERT_DISABLED
- bool reparentingChild;
-#endif
};
static_assert(sizeof(RenderElement) == sizeof(SameSizeAsRenderElement), "RenderElement should stay small");
@@ -634,11 +631,6 @@
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);
}
Modified: trunk/Source/WebCore/rendering/RenderElement.h (223193 => 223194)
--- trunk/Source/WebCore/rendering/RenderElement.h 2017-10-11 17:48:26 UTC (rev 223193)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2017-10-11 18:32:58 UTC (rev 223194)
@@ -358,11 +358,6 @@
// Store state between styleWillChange and styleDidChange
static bool s_affectsParentBlock;
static bool s_noLongerAffectsParentBlock;
-
-protected:
-#if !ASSERT_DISABLED
- bool m_reparentingChild { false };
-#endif
};
inline void RenderElement::setAncestorLineBoxDirty(bool f)
Modified: trunk/Source/WebCore/rendering/RenderListItem.cpp (223193 => 223194)
--- trunk/Source/WebCore/rendering/RenderListItem.cpp 2017-10-11 17:48:26 UTC (rev 223193)
+++ trunk/Source/WebCore/rendering/RenderListItem.cpp 2017-10-11 18:32:58 UTC (rev 223194)
@@ -234,9 +234,6 @@
StackStats::LayoutCheckPoint layoutCheckPoint;
ASSERT(needsLayout());
-#if !ASSERT_DISABLED
- SetForScope<bool> inListItemLayout(m_inLayout, true);
-#endif
RenderBlockFlow::layout();
}
Modified: trunk/Source/WebCore/rendering/RenderListItem.h (223193 => 223194)
--- trunk/Source/WebCore/rendering/RenderListItem.h 2017-10-11 17:48:26 UTC (rev 223193)
+++ trunk/Source/WebCore/rendering/RenderListItem.h 2017-10-11 18:32:58 UTC (rev 223194)
@@ -59,10 +59,6 @@
RenderListMarker* markerRenderer() const { return m_marker.get(); }
void setMarkerRenderer(RenderListMarker& marker) { m_marker = makeWeakPtr(marker); }
-#if !ASSERT_DISABLED
- bool inLayout() const { return m_inLayout; }
-#endif
-
private:
void willBeDestroyed() override;
@@ -90,9 +86,6 @@
int m_explicitValue;
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;
bool m_notInList : 1;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
