third_party/WebKit/Source/core/layout/ng/ng_block_layout_algorithm.cc - Issue 2670643004: Rename EDisplay values with k prefix.

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.cc

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)

Patch Set: Rebase Created 3 years, 9 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/line/InlineFlowBox.h ('k') | third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceClipper.cpp » ('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.cc

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

index 548653cc53791769e06c5724175ec75e0f7b55e5..a7b476f4d0a6aefdc1590f2e55431bb444b59835 100644

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

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

@@ -36,7 +36,7 @@ bool ShouldShrinkToFit(const NGConstraintSpace& parent_space,

bool is_in_parallel_flow =

IsParallelWritingMode(parent_space.WritingMode(), child_writing_mode);

- return child_style.display() == EDisplay::InlineBlock ||

+ return child_style.display() == EDisplay::kInlineBlock ||

child_style.isFloating() || !is_in_parallel_flow;

}

@@ -285,8 +285,8 @@ bool IsNewFormattingContextForInFlowBlockLevelChild(

return true;

EDisplay display = style.display();

- if (display == EDisplay::Grid || display == EDisplay::Flex ||

- display == EDisplay::WebkitBox)

+ if (display == EDisplay::kGrid || display == EDisplay::kFlex ||

+ display == EDisplay::kWebkitBox)

return true;

if (space.WritingMode() != FromPlatformWritingMode(style.getWritingMode()))