third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp - Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/

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/LayoutFlexibleBox.cpp

Issue 1743803002: Rename enums/functions that collide in chromium style in core/style/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-8

Patch Set: get-names-9 Created 4 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

« third_party/WebKit/Source/core/css/CSSProperties.in ('K') | « third_party/WebKit/Source/core/layout/LayoutDetailsMarker.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

index 643d334287ee836f25318f7a7ae6f9cd35dd206b..6abadbea5cf6963482f004e723486b2e03346560 100644

--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp

@@ -359,7 +359,7 @@ bool LayoutFlexibleBox::isHorizontalFlow() const

bool LayoutFlexibleBox::isLeftToRightFlow() const

{

if (isColumnFlow())

- return style()->writingMode() == TopToBottomWritingMode || style()->writingMode() == LeftToRightWritingMode;

+ return style()->getWritingMode() == TopToBottomWritingMode || style()->getWritingMode() == LeftToRightWritingMode;

return style()->isLeftToRightDirection() ^ (style()->flexDirection() == FlowRowReverse);

}

@@ -472,7 +472,7 @@ LayoutUnit LayoutFlexibleBox::computeMainAxisExtentForChild(const LayoutBox& chi

LayoutFlexibleBox::TransformedWritingMode LayoutFlexibleBox::transformedWritingMode() const

{

- WritingMode mode = style()->writingMode();

+ WritingMode mode = style()->getWritingMode();

if (!isColumnFlow()) {

static_assert(static_cast<TransformedWritingMode>(TopToBottomWritingMode) == TransformedWritingMode::TopToBottomWritingMode

&& static_cast<TransformedWritingMode>(LeftToRightWritingMode) == TransformedWritingMode::LeftToRightWritingMode