third_party/WebKit/Source/build/scripts/templates/StyleBuilder.cpp.tmpl - 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/build/scripts/templates/StyleBuilder.cpp.tmpl

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

« no previous file with comments | « third_party/WebKit/Source/build/scripts/make_style_builder.py ('k') | third_party/WebKit/Source/core/css/BasicShapeFunctions.cpp » ('j') | third_party/WebKit/Source/core/css/CSSProperties.in » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/build/scripts/templates/StyleBuilder.cpp.tmpl

diff --git a/third_party/WebKit/Source/build/scripts/templates/StyleBuilder.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/StyleBuilder.cpp.tmpl

index ef84c011e9af26326fcbeb0574645d6822499c90..db8b9a8552aa84e432e214137059f38786f40138 100644

--- a/third_party/WebKit/Source/build/scripts/templates/StyleBuilder.cpp.tmpl

+++ b/third_party/WebKit/Source/build/scripts/templates/StyleBuilder.cpp.tmpl

@@ -36,7 +36,7 @@ void StyleBuilder::applyProperty(CSSPropertyID property, StyleResolverState& sta

case {{property_id}}:

{% endfor %}

{

- CSSPropertyID resolvedProperty = CSSProperty::resolveDirectionAwareProperty(property, state.style()->direction(), state.style()->writingMode());

+ CSSPropertyID resolvedProperty = CSSProperty::resolveDirectionAwareProperty(property, state.style()->direction(), state.style()->getWritingMode());

ASSERT(resolvedProperty != property);

applyProperty(resolvedProperty, state, value);

return;