third_party/WebKit/Source/core/css/resolver/StyleBuilderCustom.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/StyleBuilderCustom.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/StyleAdjuster.cpp ('k') | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index dc71026d6147430ddb81a74ba08954aa996a5917..1cfe2559c8bab22c47062ff7cfb947beebd131a4 100644

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

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

@@ -424,8 +424,8 @@ void StyleBuilderFunctions::applyValueCSSPropertyTextAlign(StyleResolverState& s

void StyleBuilderFunctions::applyInheritCSSPropertyTextIndent(StyleResolverState& state)

{

state.style()->setTextIndent(state.parentStyle()->textIndent());

- state.style()->setTextIndentLine(state.parentStyle()->textIndentLine());

- state.style()->setTextIndentType(state.parentStyle()->textIndentType());

+ state.style()->setTextIndentLine(state.parentStyle()->getTextIndentLine());

+ state.style()->setTextIndentType(state.parentStyle()->getTextIndentType());

}

void StyleBuilderFunctions::applyInitialCSSPropertyTextIndent(StyleResolverState& state)

@@ -560,8 +560,8 @@ void StyleBuilderFunctions::applyInitialCSSPropertyWebkitTextEmphasisStyle(Style

void StyleBuilderFunctions::applyInheritCSSPropertyWebkitTextEmphasisStyle(StyleResolverState& state)

{

- state.style()->setTextEmphasisFill(state.parentStyle()->textEmphasisFill());

- state.style()->setTextEmphasisMark(state.parentStyle()->textEmphasisMark());

+ state.style()->setTextEmphasisFill(state.parentStyle()->getTextEmphasisFill());

+ state.style()->setTextEmphasisMark(state.parentStyle()->getTextEmphasisMark());

state.style()->setTextEmphasisCustomMark(state.parentStyle()->textEmphasisCustomMark());

}

« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleAdjuster.cpp ('k') | third_party/WebKit/Source/core/dom/Document.cpp » ('j') | no next file with comments »