third_party/WebKit/Source/core/css/resolver/StyleAdjuster.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/css/resolver/StyleAdjuster.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: rebase 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

« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/MatchedPropertiesCache.cpp ('k') | third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

diff --git a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

index feba20988d9c968c54c49e513113436250ec246f..974e53d89063329dc87f7e47912c60e4c5d16cb7 100644

--- a/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

+++ b/third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp

@@ -405,7 +405,7 @@ void StyleAdjuster::adjustStyleForDisplay(ComputedStyle& style, const ComputedSt

// FIXME: Don't support this mutation for pseudo styles like first-letter or first-line, since it's not completely

// clear how that should work.

- if (style.display() == INLINE && style.styleType() == NOPSEUDO && style.writingMode() != parentStyle.writingMode())

+ if (style.display() == INLINE && style.styleType() == NOPSEUDO && style.getWritingMode() != parentStyle.getWritingMode())

style.setDisplay(INLINE_BLOCK);

// After performing the display mutation, check table rows. We do not honor position: relative table rows or cells.

@@ -421,12 +421,12 @@ void StyleAdjuster::adjustStyleForDisplay(ComputedStyle& style, const ComputedSt

if (style.display() == TABLE_COLUMN || style.display() == TABLE_COLUMN_GROUP || style.display() == TABLE_FOOTER_GROUP

|| style.display() == TABLE_HEADER_GROUP || style.display() == TABLE_ROW || style.display() == TABLE_ROW_GROUP

|| style.display() == TABLE_CELL)

- style.setWritingMode(parentStyle.writingMode());

+ style.setWritingMode(parentStyle.getWritingMode());

// FIXME: Since we don't support block-flow on flexible boxes yet, disallow setting

// of block-flow to anything other than TopToBottomWritingMode.

// https://bugs.webkit.org/show_bug.cgi?id=46418 - Flexible box support.

- if (style.writingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX))

+ if (style.getWritingMode() != TopToBottomWritingMode && (style.display() == BOX || style.display() == INLINE_BOX))

style.setWritingMode(TopToBottomWritingMode);

if (parentStyle.isDisplayFlexibleOrGridBox()) {