third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp - 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/resolver/StyleBuilderConverter.cpp

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: get-names-13-platform: . 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/FontBuilder.cpp ('k') | third_party/WebKit/Source/core/events/GestureEvent.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5da06f170947e9b2028d6e8e8680b4f33ee6df74..554b9322ad8d40607b1de45d60bc7a1f643c56ac 100644

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

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

@@ -224,7 +224,7 @@ FontDescription::Size StyleBuilderConverter::convertFontSize(StyleResolverState&

// FIXME: Find out when parentStyle could be 0?

if (state.parentStyle())

- parentSize = state.parentFontDescription().size();

+ parentSize = state.parentFontDescription().getSize();

if (CSSValueID valueID = primitiveValue.getValueID()) {

switch (valueID) {