third_party/WebKit/Source/core/css/CSSProperties.in - Issue 1746283002: Rename enums/functions that collide in chromium style in platform/

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/CSSProperties.in

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/CSSPrimitiveValue.cpp ('k') | third_party/WebKit/Source/core/css/CSSTimingFunctionValue.h » ('j') | third_party/WebKit/Source/platform/audio/Panner.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/CSSProperties.in

diff --git a/third_party/WebKit/Source/core/css/CSSProperties.in b/third_party/WebKit/Source/core/css/CSSProperties.in

index 5e27bc899fdf461a3afd4062e791625ad7080cf0..2df7ca47a6f867013177ea562dba7698db4689a8 100644

--- a/third_party/WebKit/Source/core/css/CSSProperties.in

+++ b/third_party/WebKit/Source/core/css/CSSProperties.in

@@ -85,7 +85,7 @@ color interpolable, inherited, custom_all

direction inherited, custom_value

font-family inherited, font, type_name=FontDescription::FamilyDescription, name_for_methods=FamilyDescription, converter=convertFontFamily

font-kerning inherited, font, type_name=FontDescription::Kerning, name_for_methods=Kerning

-font-size interpolable, inherited, font, name_for_methods=Size, converter=convertFontSize

+font-size interpolable, inherited, font, name_for_methods=Size, getter=getSize, converter=convertFontSize

font-size-adjust runtime_flag=CSSFontSizeAdjust, interpolable, inherited, font, name_for_methods=SizeAdjust, converter=convertFontSizeAdjust

font-stretch inherited, font, type_name=FontStretch, name_for_methods=Stretch

font-style inherited, font, type_name=FontStyle, name_for_methods=Style