Changeset 267460 in webkit

Timestamp:

Sep 22, 2020, 8:48:22 PM (6 years ago)

Author:

Alan Bujtas

Message:

[LFC][Floats] Remove the redundant RuntimeEnabledFeatures::layoutFormattingContextIntegrationEnabled() check from FloatingState::append
​https://bugs.webkit.org/show_bug.cgi?id=216866

Reviewed by Simon Fraser.

The no-layout-box-for-the-FloatItem codepath is reserved for the IFC integration. This is temporary anyway.

• layout/floats/FloatingState.cpp:

(WebCore::Layout::FloatingState::append):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/floats/FloatingState.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-22  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][Floats] Remove the redundant RuntimeEnabledFeatures::layoutFormattingContextIntegrationEnabled() check from FloatingState::append
+        https://bugs.webkit.org/show_bug.cgi?id=216866
+
+        Reviewed by Simon Fraser.
+
+        The no-layout-box-for-the-FloatItem codepath is reserved for the IFC integration. This is temporary anyway.
+
+        * layout/floats/FloatingState.cpp:
+        (WebCore::Layout::FloatingState::append):
+
 2020-09-22  Lauro Moura  <lmoura@igalia.com>
 

trunk/Source/WebCore/layout/floats/FloatingState.cpp

@@ -62 +62 @@
 void FloatingState::append(FloatItem floatItem)
 {
-    ASSERT(is<ContainerBox>(*m_formattingContextRoot));
-#if ASSERT_ENABLED
-    if (!RuntimeEnabledFeatures::sharedFeatures().layoutFormattingContextIntegrationEnabled()) {
-        // The integration codepath does not construct a layout box for the float item.
-        ASSERT(m_floats.findMatching([&] (auto& entry) {
-            return entry.floatBox() == floatItem.floatBox();
-        }) == notFound);
-    }
-#endif
-
     if (m_floats.isEmpty())
         return m_floats.append(floatItem);
+
+    // The integration codepath does not construct a layout box for the float item.
+    ASSERT_IMPLIES(floatItem.floatBox(), m_floats.findMatching([&] (auto& entry) {
+        return entry.floatBox() == floatItem.floatBox();
+    }) == notFound);
 
     auto isLeftPositioned = floatItem.isLeftPositioned();