Changeset 258836 in webkit

Timestamp:

Mar 23, 2020 7:22:04 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC] Box::establishesBlockFormattingContext should check isInitialContainingBlock
​https://bugs.webkit.org/show_bug.cgi?id=209390
<rdar://problem/60735021>

Reviewed by Antti Koivisto.

It's more correct to call isInitialContainingBlock() to check if the current box is the ICB.

• layout/layouttree/LayoutBox.cpp:

(WebCore::Layout::Box::establishesBlockFormattingContext const):
(WebCore::Layout::Box::initialContainingBlock const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/layouttree/LayoutBox.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-23  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Box::establishesBlockFormattingContext should check isInitialContainingBlock
+        https://bugs.webkit.org/show_bug.cgi?id=209390
+        <rdar://problem/60735021>
+
+        Reviewed by Antti Koivisto.
+
+        It's more correct to call isInitialContainingBlock() to check if the current box is the ICB.
+
+        * layout/layouttree/LayoutBox.cpp:
+        (WebCore::Layout::Box::establishesBlockFormattingContext const):
+        (WebCore::Layout::Box::initialContainingBlock const):
+
 2020-03-23  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp

@@ -70 +70 @@
 bool Box::establishesBlockFormattingContext() const
 {
-    // Initial Containing Block always creates a new (inital) block formatting context.
-    if (!parent())
+    // ICB always creates a new (inital) block formatting context.
+    if (isInitialContainingBlock())
         return true;
 
@@ -246 +246 @@
         return downcast<ContainerBox>(*this);
 
-    auto* parent = this->parent();
-    for (; parent->parent(); parent = parent->parent()) { }
-
-    return *parent;
+    auto* ancestor = parent();
+    for (; ancestor->parent(); ancestor = ancestor->parent()) { }
+
+    return *ancestor;
 }