Changeset 237633 in webkit

Timestamp:

Oct 31, 2018, 6:50:05 AM (8 years ago)

Author:

Alan Bujtas

Message:

[LFC] FormattingContext class should take FormattingState&
​https://bugs.webkit.org/show_bug.cgi?id=191099

Reviewed by Antti Koivisto.

This is in preparation for not passing LayoutState& into every layout functions.
FormattingContext has FormattingState now and LayoutState can be acquired through FormattingState.
LayoutState <- FormattingState <- FormattingContext

• layout/FormattingContext.cpp:

(WebCore::Layout::FormattingContext::FormattingContext):
(WebCore::Layout::FormattingContext::formattingState const):
(WebCore::Layout::FormattingContext::layoutState const):

• layout/FormattingContext.h:
• layout/FormattingState.cpp:

(WebCore::Layout::FormattingState::FormattingState):

• layout/FormattingState.h:

(WebCore::Layout::FormattingState::layoutState const):

• layout/LayoutFormattingState.h:
• layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::BlockFormattingContext):

• layout/blockformatting/BlockFormattingContext.h:
• layout/blockformatting/BlockFormattingState.cpp:

(WebCore::Layout::BlockFormattingState::BlockFormattingState):
(WebCore::Layout::BlockFormattingState::formattingContext):
(WebCore::Layout::BlockFormattingState::formattingContext const): Deleted.

• layout/blockformatting/BlockFormattingState.h:
• layout/inlineformatting/InlineFormattingContext.cpp:

(WebCore::Layout::InlineFormattingContext::InlineFormattingContext):

• layout/inlineformatting/InlineFormattingContext.h:
• layout/inlineformatting/InlineFormattingState.cpp:

(WebCore::Layout::InlineFormattingState::InlineFormattingState):
(WebCore::Layout::InlineFormattingState::formattingContext):
(WebCore::Layout::InlineFormattingState::formattingContext const): Deleted.

• layout/inlineformatting/InlineFormattingState.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContext.cpp (modified) (2 diffs)
• layout/FormattingContext.h (modified) (4 diffs)
• layout/FormattingState.cpp (modified) (1 diff)
• layout/FormattingState.h (modified) (2 diffs)
• layout/LayoutFormattingState.h (modified) (1 diff)
• layout/blockformatting/BlockFormattingContext.cpp (modified) (1 diff)
• layout/blockformatting/BlockFormattingContext.h (modified) (1 diff)
• layout/blockformatting/BlockFormattingState.cpp (modified) (2 diffs)
• layout/blockformatting/BlockFormattingState.h (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.cpp (modified) (1 diff)
• layout/inlineformatting/InlineFormattingContext.h (modified) (1 diff)
• layout/inlineformatting/InlineFormattingState.cpp (modified) (2 diffs)
• layout/inlineformatting/InlineFormattingState.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-31  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] FormattingContext class should take FormattingState&
+        https://bugs.webkit.org/show_bug.cgi?id=191099
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for not passing LayoutState& into every layout functions.
+        FormattingContext has FormattingState now and LayoutState can be acquired through FormattingState.
+        LayoutState <- FormattingState <- FormattingContext
+
+        * layout/FormattingContext.cpp:
+        (WebCore::Layout::FormattingContext::FormattingContext):
+        (WebCore::Layout::FormattingContext::formattingState const):
+        (WebCore::Layout::FormattingContext::layoutState const):
+        * layout/FormattingContext.h:
+        * layout/FormattingState.cpp:
+        (WebCore::Layout::FormattingState::FormattingState):
+        * layout/FormattingState.h:
+        (WebCore::Layout::FormattingState::layoutState const):
+        * layout/LayoutFormattingState.h:
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::BlockFormattingContext):
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockFormattingState.cpp:
+        (WebCore::Layout::BlockFormattingState::BlockFormattingState):
+        (WebCore::Layout::BlockFormattingState::formattingContext):
+        (WebCore::Layout::BlockFormattingState::formattingContext const): Deleted.
+        * layout/blockformatting/BlockFormattingState.h:
+        * layout/inlineformatting/InlineFormattingContext.cpp:
+        (WebCore::Layout::InlineFormattingContext::InlineFormattingContext):
+        * layout/inlineformatting/InlineFormattingContext.h:
+        * layout/inlineformatting/InlineFormattingState.cpp:
+        (WebCore::Layout::InlineFormattingState::InlineFormattingState):
+        (WebCore::Layout::InlineFormattingState::formattingContext):
+        (WebCore::Layout::InlineFormattingState::formattingContext const): Deleted.
+        * layout/inlineformatting/InlineFormattingState.h:
+
 2018-10-31  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/FormattingContext.cpp

@@ -44 +44 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(FormattingContext);
 
-FormattingContext::FormattingContext(const Box& formattingContextRoot)
+FormattingContext::FormattingContext(const Box& formattingContextRoot, FormattingState& formattingState)
     : m_root(makeWeakPtr(formattingContextRoot))
+    , m_formattingState(formattingState)
 {
 }
@@ -51 +52 @@
 FormattingContext::~FormattingContext()
 {
+}
+
+FormattingState& FormattingContext::formattingState() const
+{
+    return m_formattingState;
+}
+
+LayoutState& FormattingContext::layoutState() const
+{
+    return m_formattingState.layoutState();
 }
 

trunk/Source/WebCore/layout/FormattingContext.h

@@ -29 +29 @@
 
 #include "DisplayBox.h"
-#include "FloatingState.h"
 #include <wtf/IsoMalloc.h>
 #include <wtf/WeakPtr.h>
@@ -48 +47 @@
     WTF_MAKE_ISO_ALLOCATED(FormattingContext);
 public:
-    FormattingContext(const Box& formattingContextRoot);
+    FormattingContext(const Box& formattingContextRoot, FormattingState&);
     virtual ~FormattingContext();
 
@@ -67 +66 @@
     using LayoutQueue = Vector<const Box*>;
 
+    FormattingState& formattingState() const;
+    LayoutState& layoutState() const;
     const Box& root() const { return *m_root; }
 
@@ -127 +128 @@
 
     WeakPtr<const Box> m_root;
+    FormattingState& m_formattingState;
 };
 

trunk/Source/WebCore/layout/FormattingState.cpp

@@ -36 +36 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(FormattingState);
 
-FormattingState::FormattingState(Ref<FloatingState>&& floatingState, Type type, const LayoutState& layoutState)
+FormattingState::FormattingState(Ref<FloatingState>&& floatingState, Type type, LayoutState& layoutState)
     : m_layoutState(layoutState)
     , m_floatingState(WTFMove(floatingState))

trunk/Source/WebCore/layout/FormattingState.h

@@ -47 +47 @@
     virtual ~FormattingState();
 
-    virtual std::unique_ptr<FormattingContext>formattingContext(const Box& formattingContextRoot) const = 0;
+    virtual std::unique_ptr<FormattingContext>formattingContext(const Box& formattingContextRoot) = 0;
 
     FloatingState& floatingState() const { return m_floatingState; }
@@ -61 +61 @@
     bool isInlineFormattingState() const { return m_type == Type::Inline; }
 
+    LayoutState& layoutState() const { return m_layoutState; }
+
 protected:
     enum class Type { Block, Inline };
-    FormattingState(Ref<FloatingState>&&, Type, const LayoutState&);
-
-    const LayoutState& m_layoutState;
+    FormattingState(Ref<FloatingState>&&, Type, LayoutState&);
 
 private:
+    LayoutState& m_layoutState;
     Ref<FloatingState> m_floatingState;
     HashMap<const Box*, FormattingContext::InstrinsicWidthConstraints> m_instrinsicWidthConstraints;

trunk/Source/WebCore/layout/LayoutFormattingState.h

@@ -28 +28 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
-#include "FormattingContext.h"
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp

@@ -45 +45 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(BlockFormattingContext);
 
-BlockFormattingContext::BlockFormattingContext(const Box& formattingContextRoot)
-    : FormattingContext(formattingContextRoot)
+BlockFormattingContext::BlockFormattingContext(const Box& formattingContextRoot, FormattingState& formattingState)
+    : FormattingContext(formattingContextRoot, formattingState)
 {
 }

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h

@@ -46 +46 @@
     WTF_MAKE_ISO_ALLOCATED(BlockFormattingContext);
 public:
-    BlockFormattingContext(const Box& formattingContextRoot);
+    BlockFormattingContext(const Box& formattingContextRoot, FormattingState& formattingState);
 
     void layout(LayoutState&, FormattingState&) const override;

trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.cpp

@@ -38 +38 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(BlockFormattingState);
 
-BlockFormattingState::BlockFormattingState(Ref<FloatingState>&& floatingState, const LayoutState& layoutState)
+BlockFormattingState::BlockFormattingState(Ref<FloatingState>&& floatingState, LayoutState& layoutState)
     : FormattingState(WTFMove(floatingState), Type::Block, layoutState)
 {
@@ -47 +47 @@
 }
 
-std::unique_ptr<FormattingContext> BlockFormattingState::formattingContext(const Box& formattingContextRoot) const
+std::unique_ptr<FormattingContext> BlockFormattingState::formattingContext(const Box& formattingContextRoot)
 {
     ASSERT(formattingContextRoot.establishesBlockFormattingContext());
-    return std::make_unique<BlockFormattingContext>(formattingContextRoot);
+    return std::make_unique<BlockFormattingContext>(formattingContextRoot, *this);
 }
 

trunk/Source/WebCore/layout/blockformatting/BlockFormattingState.h

@@ -39 +39 @@
     WTF_MAKE_ISO_ALLOCATED(BlockFormattingState);
 public:
-    BlockFormattingState(Ref<FloatingState>&&, const LayoutState&);
+    BlockFormattingState(Ref<FloatingState>&&, LayoutState&);
     virtual ~BlockFormattingState();
 
-    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) const override;
+    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) override;
 };
 

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp

@@ -47 +47 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(InlineFormattingContext);
 
-InlineFormattingContext::InlineFormattingContext(const Box& formattingContextRoot)
-    : FormattingContext(formattingContextRoot)
+InlineFormattingContext::InlineFormattingContext(const Box& formattingContextRoot, FormattingState& formattingState)
+    : FormattingContext(formattingContextRoot, formattingState)
 {
 }

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingContext.h

@@ -44 +44 @@
     WTF_MAKE_ISO_ALLOCATED(InlineFormattingContext);
 public:
-    InlineFormattingContext(const Box& formattingContextRoot);
+    InlineFormattingContext(const Box& formattingContextRoot, FormattingState&);
 
     void layout(LayoutState&, FormattingState&) const override;

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp

@@ -36 +36 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(InlineFormattingState);
 
-InlineFormattingState::InlineFormattingState(Ref<FloatingState>&& floatingState, const LayoutState& layoutState)
+InlineFormattingState::InlineFormattingState(Ref<FloatingState>&& floatingState, LayoutState& layoutState)
     : FormattingState(WTFMove(floatingState), Type::Inline, layoutState)
 {
@@ -45 +45 @@
 }
 
-std::unique_ptr<FormattingContext> InlineFormattingState::formattingContext(const Box& formattingContextRoot) const
+std::unique_ptr<FormattingContext> InlineFormattingState::formattingContext(const Box& formattingContextRoot)
 {
     ASSERT(formattingContextRoot.establishesInlineFormattingContext());
-    return std::make_unique<InlineFormattingContext>(formattingContextRoot);
+    return std::make_unique<InlineFormattingContext>(formattingContextRoot, this);
 }
 

trunk/Source/WebCore/layout/inlineformatting/InlineFormattingState.h

@@ -40 +40 @@
     WTF_MAKE_ISO_ALLOCATED(InlineFormattingState);
 public:
-    InlineFormattingState(Ref<FloatingState>&&, const LayoutState&);
+    InlineFormattingState(Ref<FloatingState>&&, LayoutState&);
     virtual ~InlineFormattingState();
 
-    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) const override;
+    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) override;
 
     InlineContent& inlineContent() { return m_inlineContent; }