third_party/WebKit/Source/core/layout/LayoutGrid.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/LayoutGrid.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/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutImage.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index e294061f630a284ea13a33f3db6fc4fca3bcfac6..c49a7f40467a4665035b4239c3668efbfb2e0916 100644

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

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

@@ -298,7 +298,7 @@ void LayoutGrid::styleDidChange(StyleDifference diff, const ComputedStyle* oldSt

if (explicitGridDidResize(*oldStyle)

|| namedGridLinesDefinitionDidChange(*oldStyle)

- || oldStyle->gridAutoFlow() != styleRef().gridAutoFlow())

+ || oldStyle->getGridAutoFlow() != styleRef().getGridAutoFlow())

dirtyGrid();

}

@@ -1795,7 +1795,7 @@ void LayoutGrid::updateAutoMarginsInColumnAxisIfNeeded(LayoutBox& child)

GridAxisPosition LayoutGrid::columnAxisPositionForChild(const LayoutBox& child) const

{

bool hasOrthogonalWritingMode = child.isHorizontalWritingMode() != isHorizontalWritingMode();

- bool hasSameWritingMode = child.styleRef().writingMode() == styleRef().writingMode();

+ bool hasSameWritingMode = child.styleRef().getWritingMode() == styleRef().getWritingMode();

switch (ComputedStyle::resolveAlignment(styleRef(), child.styleRef(), ItemPositionStretch)) {

case ItemPositionSelfStart: