Attachment 356819 Details for Bug 192500 – patch

[patch] patch

formattingcontext-rename-2.patch (text/plain), 9.84 KB, created by Antti Koivisto on 2018-12-07 10:26:38 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2018-12-07 10:26:38 PST

Size: 9.84 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 238952)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,23 @@
>+2018-12-07  Antti Koivisto  <antti@apple.com>
>+
>+        [LFC] Rename formattingContext() to createFormattingContext()
>+        https://bugs.webkit.org/show_bug.cgi?id=192500
>+
>+        Reviewed by Zalan Bujtas.
>+
>+        * layout/FormattingContext.cpp:
>+        (WebCore::Layout::FormattingContext::layoutOutOfFlowDescendants const):
>+        * layout/FormattingState.h:
>+        * layout/LayoutFormattingState.cpp:
>+        (WebCore::Layout::LayoutState::layoutFormattingContextSubtree):
>+        * layout/blockformatting/BlockFormattingState.cpp:
>+        (WebCore::Layout::BlockFormattingState::createFormattingContext):
>+        (WebCore::Layout::BlockFormattingState::formattingContext): Deleted.
>+        * layout/blockformatting/BlockFormattingState.h:
>+        * layout/inlineformatting/InlineFormattingContext.cpp:
>+        (WebCore::Layout::InlineFormattingContext::layoutFormattingContextRoot const):
>+        * layout/inlineformatting/InlineFormattingState.h:
>+
> 2018-12-07  Eric Carlson  <eric.carlson@apple.com>
> 
>         [iOS] Don't update AVPlayerViewController currentTime while scrubbing
>Index: Source/WebCore/layout/FormattingContext.cpp
>===================================================================
>--- Source/WebCore/layout/FormattingContext.cpp	(revision 238859)
>+++ Source/WebCore/layout/FormattingContext.cpp	(working copy)
>@@ -154,7 +154,7 @@ void FormattingContext::layoutOutOfFlowD
>         computeBorderAndPadding(layoutBox);
>         computeOutOfFlowHorizontalGeometry(layoutBox);
> 
>-        layoutState.createFormattingStateForFormattingRootIfNeeded(layoutBox).formattingContext(layoutBox)->layout();
>+        layoutState.createFormattingStateForFormattingRootIfNeeded(layoutBox).createFormattingContext(layoutBox)->layout();
> 
>         computeOutOfFlowVerticalGeometry(layoutBox);
>         layoutOutOfFlowDescendants(layoutBox);
>Index: Source/WebCore/layout/FormattingContextGeometry.cpp
>===================================================================
>--- Source/WebCore/layout/FormattingContextGeometry.cpp	(revision 238859)
>+++ Source/WebCore/layout/FormattingContextGeometry.cpp	(working copy)
>@@ -239,7 +239,7 @@ LayoutUnit FormattingContext::Geometry::
>     // Then the shrink-to-fit width is: min(max(preferred minimum width, available width), preferred width).
>     auto availableWidth = layoutState.displayBoxForLayoutBox(*formattingRoot.containingBlock()).width();
>     auto& formattingState = layoutState.createFormattingStateForFormattingRootIfNeeded(formattingRoot);
>-    auto instrinsicWidthConstraints = formattingState.formattingContext(formattingRoot)->instrinsicWidthConstraints();
>+    auto instrinsicWidthConstraints = formattingState.createFormattingContext(formattingRoot)->instrinsicWidthConstraints();
>     return std::min(std::max(instrinsicWidthConstraints.minimum, availableWidth), instrinsicWidthConstraints.maximum);
> }
> 
>Index: Source/WebCore/layout/FormattingState.h
>===================================================================
>--- Source/WebCore/layout/FormattingState.h	(revision 238859)
>+++ Source/WebCore/layout/FormattingState.h	(working copy)
>@@ -46,7 +46,7 @@ class FormattingState {
> public:
>     virtual ~FormattingState();
> 
>-    virtual std::unique_ptr<FormattingContext>formattingContext(const Box& formattingContextRoot) = 0;
>+    virtual std::unique_ptr<FormattingContext> createFormattingContext(const Box& formattingContextRoot) = 0;
> 
>     FloatingState& floatingState() const { return m_floatingState; }
> 
>Index: Source/WebCore/layout/LayoutFormattingState.cpp
>===================================================================
>--- Source/WebCore/layout/LayoutFormattingState.cpp	(revision 238859)
>+++ Source/WebCore/layout/LayoutFormattingState.cpp	(working copy)
>@@ -78,7 +78,7 @@ void LayoutState::layoutFormattingContex
> {
>     RELEASE_ASSERT(layoutRoot.establishesFormattingContext());
>     auto& formattingState = createFormattingStateForFormattingRootIfNeeded(layoutRoot);
>-    auto formattingContext = formattingState.formattingContext(layoutRoot);
>+    auto formattingContext = formattingState.createFormattingContext(layoutRoot);
>     formattingContext->layout();
>     formattingContext->layoutOutOfFlowDescendants(layoutRoot);
> }
>Index: Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp
>===================================================================
>--- Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp	(revision 238859)
>+++ Source/WebCore/layout/blockformatting/BlockFormattingContext.cpp	(working copy)
>@@ -134,7 +134,7 @@ void BlockFormattingContext::layoutForma
> 
>     precomputeVerticalPositionForFormattingRootIfNeeded(layoutBox);
>     // Swich over to the new formatting context (the one that the root creates).
>-    auto formattingContext = layoutState().createFormattingStateForFormattingRootIfNeeded(layoutBox).formattingContext(layoutBox);
>+    auto formattingContext = layoutState().createFormattingStateForFormattingRootIfNeeded(layoutBox).createFormattingContext(layoutBox);
>     formattingContext->layout();
> 
>     // Come back and finalize the root's geometry.
>@@ -417,7 +417,7 @@ FormattingContext::InstrinsicWidthConstr
>                 if (!Geometry::instrinsicWidthConstraintsNeedChildrenWidth(childBox))
>                     instrinsicWidthConstraints = Geometry::instrinsicWidthConstraints(layoutState, childBox);
>                 else if (childBox.establishesFormattingContext())
>-                    instrinsicWidthConstraints = layoutState.createFormattingStateForFormattingRootIfNeeded(childBox).formattingContext(childBox)->instrinsicWidthConstraints();
>+                    instrinsicWidthConstraints = layoutState.createFormattingStateForFormattingRootIfNeeded(childBox).createFormattingContext(childBox)->instrinsicWidthConstraints();
>                 formattingState.setInstrinsicWidthConstraints(childBox, instrinsicWidthConstraints);
> 
>                 queue.removeLast();
>Index: Source/WebCore/layout/blockformatting/BlockFormattingState.cpp
>===================================================================
>--- Source/WebCore/layout/blockformatting/BlockFormattingState.cpp	(revision 238859)
>+++ Source/WebCore/layout/blockformatting/BlockFormattingState.cpp	(working copy)
>@@ -46,7 +46,7 @@ BlockFormattingState::~BlockFormattingSt
> {
> }
> 
>-std::unique_ptr<FormattingContext> BlockFormattingState::formattingContext(const Box& formattingContextRoot)
>+std::unique_ptr<FormattingContext> BlockFormattingState::createFormattingContext(const Box& formattingContextRoot)
> {
>     ASSERT(formattingContextRoot.establishesBlockFormattingContext());
>     return std::make_unique<BlockFormattingContext>(formattingContextRoot, *this);
>Index: Source/WebCore/layout/blockformatting/BlockFormattingState.h
>===================================================================
>--- Source/WebCore/layout/blockformatting/BlockFormattingState.h	(revision 238859)
>+++ Source/WebCore/layout/blockformatting/BlockFormattingState.h	(working copy)
>@@ -41,7 +41,7 @@ public:
>     BlockFormattingState(Ref<FloatingState>&&, LayoutState&);
>     virtual ~BlockFormattingState();
> 
>-    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) override;
>+    std::unique_ptr<FormattingContext> createFormattingContext(const Box& formattingContextRoot) override;
> };
> 
> }
>Index: Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp
>===================================================================
>--- Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp	(revision 238859)
>+++ Source/WebCore/layout/inlineformatting/InlineFormattingContext.cpp	(working copy)
>@@ -373,7 +373,7 @@ void InlineFormattingContext::layoutForm
>     computeBorderAndPadding(root);
>     computeWidthAndMargin(root);
>     // Swich over to the new formatting context (the one that the root creates).
>-    auto formattingContext = layoutState().createFormattingStateForFormattingRootIfNeeded(root).formattingContext(root);
>+    auto formattingContext = layoutState().createFormattingStateForFormattingRootIfNeeded(root).createFormattingContext(root);
>     formattingContext->layout();
>     // Come back and finalize the root's height and margin.
>     computeHeightAndMargin(root);
>Index: Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp
>===================================================================
>--- Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp	(revision 238859)
>+++ Source/WebCore/layout/inlineformatting/InlineFormattingState.cpp	(working copy)
>@@ -44,7 +44,7 @@ InlineFormattingState::~InlineFormatting
> {
> }
> 
>-std::unique_ptr<FormattingContext> InlineFormattingState::formattingContext(const Box& formattingContextRoot)
>+std::unique_ptr<FormattingContext> InlineFormattingState::createFormattingContext(const Box& formattingContextRoot)
> {
>     ASSERT(formattingContextRoot.establishesInlineFormattingContext());
>     return std::make_unique<InlineFormattingContext>(formattingContextRoot, *this);
>Index: Source/WebCore/layout/inlineformatting/InlineFormattingState.h
>===================================================================
>--- Source/WebCore/layout/inlineformatting/InlineFormattingState.h	(revision 238859)
>+++ Source/WebCore/layout/inlineformatting/InlineFormattingState.h	(working copy)
>@@ -43,7 +43,7 @@ public:
>     InlineFormattingState(Ref<FloatingState>&&, LayoutState&);
>     virtual ~InlineFormattingState();
> 
>-    std::unique_ptr<FormattingContext> formattingContext(const Box& formattingContextRoot) override;
>+    std::unique_ptr<FormattingContext> createFormattingContext(const Box& formattingContextRoot) override;
> 
>     InlineContent& inlineContent() { return m_inlineContent; }
>     InlineItem* lastInlineItem() const { return m_inlineContent.isEmpty() ? nullptr : m_inlineContent.last().get(); }

Actions: View | Formatted Diff | Diff

Attachments on bug 192500: 356818 | 356819