Attachment 341458 Details for Bug 186036 – Patch

[patch] Patch

bug-186036-20180528101844.patch (text/plain), 5.78 KB, created by zalan on 2018-05-28 10:18:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: zalan

Created: 2018-05-28 10:18:45 PDT

Size: 5.78 KB

patch

obsolete

>Subversion Revision: 232247
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3f06ab0f018a31eaf27c1c98337026709ed58810..6d7dd3c0bfa9b828df0aac648b0b9258a4354bc8 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-05-28  Zalan Bujtas  <zalan@apple.com>
>+
>+        [LFC] Add formatting context testing codepath in FrameViewLayoutContext
>+        https://bugs.webkit.org/show_bug.cgi?id=186036
>+
>+        Reviewed by Antti Koivisto.
>+
>+        This is to verify the formatting context layout correctness.
>+
>+        * layout/LayoutContext.cpp:
>+        (WebCore::Layout::LayoutContext::LayoutContext):
>+        (WebCore::Layout::LayoutContext::initializeRoot):
>+        * layout/LayoutContext.h:
>+        (WebCore::Layout::LayoutContext::displayBoxForLayoutBox const):
>+        * page/FrameViewLayoutContext.cpp:
>+        (WebCore::layoutUsingFormattingContext):
>+        (WebCore::FrameViewLayoutContext::layout):
>+
> 2018-05-28  Sam Weinig  <sam@webkit.org>
> 
>         Modernize SVGRenderStyleDefs.h
>diff --git a/Source/WebCore/layout/LayoutContext.cpp b/Source/WebCore/layout/LayoutContext.cpp
>index bc0de8631d7c20da0861442b39aa618afdca73ff..202b8e4cfaccd824ac114f27b6e10c6a65ad2ace 100644
>--- a/Source/WebCore/layout/LayoutContext.cpp
>+++ b/Source/WebCore/layout/LayoutContext.cpp
>@@ -45,11 +45,37 @@ namespace Layout {
> 
> WTF_MAKE_ISO_ALLOCATED_IMPL(LayoutContext);
> 
>-LayoutContext::LayoutContext(const Box& root)
>-    : m_root(makeWeakPtr(const_cast<Box&>(root)))
>+LayoutContext::LayoutContext()
> {
> }
> 
>+void LayoutContext::initializeRoot(const Container& root, const LayoutSize& containerSize)
>+{
>+    m_root = makeWeakPtr(const_cast<Container&>(root));
>+    auto& displayBox = createDisplayBox(root);
>+    // Root is always at 0 0 with no margin 
>+    displayBox.setTopLeft({ });
>+    displayBox.setWidth(containerSize.width());
>+    displayBox.setHeight(containerSize.height());
>+    displayBox.setMargin({ });
>+
>+    auto& style = root.style();
>+    // FIXME: m_root could very well be a formatting context root with ancestors and resolvable border and padding (as opposed to the topmost root)  
>+    displayBox.setBorder({
>+        style.borderTop().width(),
>+        style.borderLeft().width(),
>+        style.borderBottom().width(),
>+        style.borderRight().width()
>+
>+    });
>+    displayBox.setPadding({
>+        valueForLength(style.paddingTop(), containerSize.width()),
>+        valueForLength(style.paddingLeft(), containerSize.width()),
>+        valueForLength(style.paddingBottom(), containerSize.width()),
>+        valueForLength(style.paddingRight(), containerSize.width())
>+    });
>+}
>+
> void LayoutContext::updateLayout()
> {
>     ASSERT(!m_formattingContextRootListForLayout.isEmpty());
>diff --git a/Source/WebCore/layout/LayoutContext.h b/Source/WebCore/layout/LayoutContext.h
>index 01d92da3ea413f259f3e80e42f41826dadb34fc8..74050604223d28bd194b82da955ac636f5b2f2b7 100644
>--- a/Source/WebCore/layout/LayoutContext.h
>+++ b/Source/WebCore/layout/LayoutContext.h
>@@ -54,13 +54,10 @@ class Container;
> class LayoutContext {
>     WTF_MAKE_ISO_ALLOCATED(LayoutContext);
> public:
>-    LayoutContext(const Box& root);
>+    LayoutContext();
> 
>+    void initializeRoot(const Container&, const LayoutSize&);
>     void updateLayout();
>-
>-    Display::Box& createDisplayBox(const Box&);
>-    Display::Box* displayBoxForLayoutBox(const Box& layoutBox) const { return m_layoutToDisplayBox.get(&layoutBox); }
>-
>     void styleChanged(const Box&, StyleDiff);
> 
>     enum class UpdateType {
>@@ -76,8 +73,11 @@ public:
>     FormattingState& establishedFormattingState(const Box& formattingContextRoot, const FormattingContext&);
>     std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot);
> 
>+    Display::Box& createDisplayBox(const Box&);
>+    Display::Box* displayBoxForLayoutBox(const Box& layoutBox) const { return m_layoutToDisplayBox.get(&layoutBox); }
>+
> private:
>-    WeakPtr<Box> m_root;
>+    WeakPtr<Container> m_root;
>     HashSet<const Container*> m_formattingContextRootListForLayout;
>     HashMap<const Box*, std::unique_ptr<FormattingState>> m_formattingStates;
>     HashMap<const Box*, std::unique_ptr<Display::Box>> m_layoutToDisplayBox;
>diff --git a/Source/WebCore/page/FrameViewLayoutContext.cpp b/Source/WebCore/page/FrameViewLayoutContext.cpp
>index a1d5d1224f0be22727a3e096d269ebe898f604e7..6b331acf0af0ddf8339a5f3cce2b079edbcb3560 100644
>--- a/Source/WebCore/page/FrameViewLayoutContext.cpp
>+++ b/Source/WebCore/page/FrameViewLayoutContext.cpp
>@@ -39,12 +39,29 @@
> #include "ScriptDisallowedScope.h"
> #include "Settings.h"
> 
>+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
>+#include "LayoutContainer.h"
>+#include "LayoutContext.h"
>+#include "LayoutTreeBuilder.h"
>+#endif
>+
> #include <wtf/SetForScope.h>
> #include <wtf/SystemTracing.h>
> #include <wtf/text/TextStream.h>
> 
> namespace WebCore {
> 
>+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
>+static void layoutUsingFormattingContext(const RenderView& renderView)
>+{
>+    auto initialContainingBlock = Layout::TreeBuilder::createLayoutTree(renderView);
>+    auto layoutContext = std::make_unique<Layout::LayoutContext>();
>+    layoutContext->initializeRoot(*initialContainingBlock, renderView.size());
>+    layoutContext->updateLayout();
>+    layoutContext->verifyAndOutputMismatchingLayoutTree(renderView);
>+} 
>+#endif
>+
> static bool isObjectAncestorContainerOf(RenderElement& ancestor, RenderElement& descendant)
> {
>     for (auto* renderer = &descendant; renderer; renderer = renderer->container()) {
>@@ -189,6 +206,9 @@ void FrameViewLayoutContext::layout()
>         RenderTreeNeedsLayoutChecker checker(*layoutRoot);
> #endif
>         layoutRoot->layout();
>+#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
>+    layoutUsingFormattingContext(*renderView());
>+#endif
>         ++m_layoutCount;
> #if ENABLE(TEXT_AUTOSIZING)
>         applyTextSizingIfNeeded(*layoutRoot.get());

Actions: View | Formatted Diff | Diff

Attachments on bug 186036: 341455 | 341458