Changeset 246477 in webkit

Timestamp:

Jun 16, 2019 12:30:46 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC] Add limited quirks mode to LayoutState.
​https://bugs.webkit.org/show_bug.cgi?id=198881
<rdar://problem/51773229>

Reviewed by Antti Koivisto.

This is in preparation for introducing limited quirks mode to inline layout.

• layout/LayoutState.h:

(WebCore::Layout::LayoutState::setQuirksMode):
(WebCore::Layout::LayoutState::inQuirksMode const):
(WebCore::Layout::LayoutState::inLimitedQuirksMode const):
(WebCore::Layout::LayoutState::inNoQuirksMode const):
(WebCore::Layout::LayoutState::setInQuirksMode): Deleted.

• page/FrameViewLayoutContext.cpp:

(WebCore::layoutUsingFormattingContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutState.h (modified) (3 diffs)
• page/FrameViewLayoutContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-06-16  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Add limited quirks mode to LayoutState.
+        https://bugs.webkit.org/show_bug.cgi?id=198881
+        <rdar://problem/51773229>
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for introducing limited quirks mode to inline layout.
+
+        * layout/LayoutState.h:
+        (WebCore::Layout::LayoutState::setQuirksMode):
+        (WebCore::Layout::LayoutState::inQuirksMode const):
+        (WebCore::Layout::LayoutState::inLimitedQuirksMode const):
+        (WebCore::Layout::LayoutState::inNoQuirksMode const):
+        (WebCore::Layout::LayoutState::setInQuirksMode): Deleted.
+        * page/FrameViewLayoutContext.cpp:
+        (WebCore::layoutUsingFormattingContext):
+
 2019-06-16  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/LayoutState.h

@@ -64 +64 @@
     void updateLayout();
     void styleChanged(const Box&, StyleDiff);
-    void setInQuirksMode(bool inQuirksMode) { m_inQuirksMode = inQuirksMode; }
+    enum class QuirksMode { No, Limited, Yes };
+    void setQuirksMode(QuirksMode quirksMode) { m_quirksMode = quirksMode; }
 
     enum class UpdateType {
@@ -89 +90 @@
     bool hasDisplayBox(const Box& layoutBox) const { return m_layoutToDisplayBox.contains(&layoutBox); }
 
-    bool inQuirksMode() const { return m_inQuirksMode; }
+    bool inQuirksMode() const { return m_quirksMode == QuirksMode::Yes; }
+    bool inLimitedQuirksMode() const { return m_quirksMode == QuirksMode::Limited; }
+    bool inNoQuirksMode() const { return m_quirksMode == QuirksMode::No; }
     // For testing purposes only
     void verifyAndOutputMismatchingLayoutTree(const RenderView&) const;
@@ -104 +107 @@
 #endif
     mutable HashMap<const Box*, std::unique_ptr<Display::Box>> m_layoutToDisplayBox;
-    bool m_inQuirksMode { false };
+    QuirksMode m_quirksMode { QuirksMode::No };
 };
 

trunk/Source/WebCore/page/FrameViewLayoutContext.cpp

@@ -61 +61 @@
     auto initialContainingBlock = Layout::TreeBuilder::createLayoutTree(renderView);
     auto layoutState = std::make_unique<Layout::LayoutState>(*initialContainingBlock);
-    layoutState->setInQuirksMode(renderView.document().inQuirksMode());
+    auto quirksMode = Layout::LayoutState::QuirksMode::No;
+    if (renderView.document().inLimitedQuirksMode())
+        quirksMode = Layout::LayoutState::QuirksMode::Limited;
+    else if (renderView.document().inQuirksMode())
+        quirksMode = Layout::LayoutState::QuirksMode::Yes;
+    layoutState->setQuirksMode(quirksMode);
     layoutState->updateLayout();
     layoutState->verifyAndOutputMismatchingLayoutTree(renderView);