Attachment 346379 Details for Bug 188257 – Patch

[patch] Patch

bug-188257-20180802074857.patch (text/plain), 3.67 KB, created by zalan on 2018-08-02 07:48:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-08-02 07:48:58 PDT

Size: 3.67 KB

patch

obsolete

>Subversion Revision: 234499
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 9612d74098ade7409087621601d11a2bb57aefc6..1a618071e10775f23f2b47ddcf594474e2dca47b 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-08-02  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC][Floating] Do not pass formatting root to FloatingContext
>+        https://bugs.webkit.org/show_bug.cgi?id=188257
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        If we ever need it, we can get it from FloatingState.
>+
>+        * layout/FloatingContext.cpp:
>+        (WebCore::Layout::FloatingContext::FloatingContext):
>+        * layout/FloatingContext.h:
>+        * layout/blockformatting/BlockFormattingContext.cpp:
>+        (WebCore::Layout::BlockFormattingContext::layout const):
>+
> 2018-08-01  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC][Floating] Convert all coordinates relative to the formatting context root.
>diff --git a/Source/WebCore/layout/FloatingContext.cpp b/Source/WebCore/layout/FloatingContext.cpp
>index c33c91244bac1c6dc0e0471c1baa4c82cddffec2..d257aed6192c17a15d77656748db6ebc9874ea6d 100644
>--- a/Source/WebCore/layout/FloatingContext.cpp
>+++ b/Source/WebCore/layout/FloatingContext.cpp
>@@ -110,11 +110,9 @@ static Iterator end(const LayoutContext& layoutContext, const FloatingState& flo
>     return Iterator(layoutContext, floatingState.floats(), std::nullopt);
> }
> 
>-FloatingContext::FloatingContext(const Container& formattingContextRoot, FloatingState& floatingState)
>-    : m_formattingContextRoot(formattingContextRoot)
>-    , m_floatingState(floatingState)
>+FloatingContext::FloatingContext(FloatingState& floatingState)
>+    : m_floatingState(floatingState)
> {
>-    ASSERT(m_formattingContextRoot.establishesFormattingContext());
> }
> 
> Position FloatingContext::computePosition(const Box& layoutBox) const
>diff --git a/Source/WebCore/layout/FloatingContext.h b/Source/WebCore/layout/FloatingContext.h
>index d87c71c85aa010f67f3bbd4f3d2f5784bc2c2679..cdb4cc2e6a805938490d7446102ef16dbb66a4ba 100644
>--- a/Source/WebCore/layout/FloatingContext.h
>+++ b/Source/WebCore/layout/FloatingContext.h
>@@ -45,7 +45,7 @@ class LayoutContext;
> class FloatingContext {
>     WTF_MAKE_ISO_ALLOCATED(FloatingContext);
> public:
>-    FloatingContext(const Container& formattingContextRoot, FloatingState&);
>+    FloatingContext(FloatingState&);
> 
>     FloatingState& floatingState() const { return m_floatingState; }
> 
>@@ -61,7 +61,6 @@ private:
>     LayoutUnit alignWithFloatings(const FloatingPair&, const FloatingState::FloatItem&) const;
>     Position toContainingBlock(const FloatingState::FloatItem&, Position) const;
> 
>-    const Container& m_formattingContextRoot;
>     FloatingState& m_floatingState;
> };
> 
>diff --git a/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp b/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>index a04d907fe43e2238402e3e680b65d42f41f5cb59..07fe9481bdecb478e6b84cd6615aaa01db8195ec 100644
>--- a/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>+++ b/Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>@@ -62,7 +62,7 @@ void BlockFormattingContext::layout(LayoutContext& layoutContext, FormattingStat
> 
>     auto& formattingRoot = downcast<Container>(root());
>     LayoutQueue layoutQueue;
>-    FloatingContext floatingContext(formattingRoot, formattingState.floatingState());
>+    FloatingContext floatingContext(formattingState.floatingState());
>     // This is a post-order tree traversal layout.
>     // The root container layout is done in the formatting context it lives in, not that one it creates, so let's start with the first child.
>     if (auto* firstChild = formattingRoot.firstInFlowOrFloatingChild())

Flags:

koivisto: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 188257: 346379