third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h - Issue 2723023003: Revert of [LayoutNG] Move remaining ng_units structs to their own files

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h

Issue 2723023003: Revert of [LayoutNG] Move remaining ng_units structs to their own files (Closed)

Patch Set: Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/core/layout/ng/ng_absolute_utils_test.cc ('k') | third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h

diff --git a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h

index 117678b7adfddea7981e103d9e0206e68b8efc03..f0d9377e4b8e54835bcb130907b068fa7a3e4c7f 100644

--- a/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h

+++ b/third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.h

@@ -6,11 +6,11 @@

#define NGBlockLayoutAlgorithm_h

#include "core/CoreExport.h"

-#include "core/layout/ng/geometry/ng_margin_strut.h"

#include "core/layout/ng/ng_block_node.h"

#include "core/layout/ng/ng_break_token.h"

#include "core/layout/ng/ng_fragment_builder.h"

#include "core/layout/ng/ng_layout_algorithm.h"

+#include "core/layout/ng/ng_units.h"

#include "wtf/RefPtr.h"

namespace blink {

@@ -35,7 +35,7 @@

NGConstraintSpace* space,

NGBlockBreakToken* break_token = nullptr);

- Optional<MinMaxContentSize> ComputeMinMaxContentSize() const override;

+ Optional<MinAndMaxContentSizes> ComputeMinAndMaxContentSizes() const override;

RefPtr<NGLayoutResult> Layout() override;

private: