Changeset 237451 in webkit

Timestamp:

Oct 26, 2018, 7:25:14 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC] Inline formatting context has higher priority than block
​https://bugs.webkit.org/show_bug.cgi?id=190924

Reviewed by Antti Koivisto.

When an element establishes both inline and block formatting contexts, we need to pick one to
create (and we choose the content driven formatting type (inline)). See example below:

<div style="overflow: hidden">This text should be inside an inlines formatting context.</div>

• layout/LayoutContext.cpp:

(WebCore::Layout::LayoutContext::formattingContext const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-26  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Inline formatting context has higher priority than block
+        https://bugs.webkit.org/show_bug.cgi?id=190924
+
+        Reviewed by Antti Koivisto.
+
+        When an element establishes both inline and block formatting contexts, we need to pick one to
+        create (and we choose the content driven formatting type (inline)). See example below:
+
+        <div style="overflow: hidden">This text should be inside an inlines formatting context.</div>
+
+        * layout/LayoutContext.cpp:
+        (WebCore::Layout::LayoutContext::formattingContext const):
+
 2018-10-26  Ali Juma  <ajuma@chromium.org>
 

trunk/Source/WebCore/layout/LayoutContext.cpp

@@ -159 +159 @@
 std::unique_ptr<FormattingContext> LayoutContext::formattingContext(const Box& formattingContextRoot) const
 {
+    if (formattingContextRoot.establishesInlineFormattingContext())
+        return std::make_unique<InlineFormattingContext>(formattingContextRoot);
+
     if (formattingContextRoot.establishesBlockFormattingContext())
         return std::make_unique<BlockFormattingContext>(formattingContextRoot);
-
-    if (formattingContextRoot.establishesInlineFormattingContext())
-        return std::make_unique<InlineFormattingContext>(formattingContextRoot);
 
     ASSERT_NOT_IMPLEMENTED_YET();