third_party/WebKit/Source/core/css/resolver/StyleBuilderConverter.cpp - Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide.

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 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 years, 9 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/FontBuilderTest.cpp ('k') | third_party/WebKit/Source/core/css/resolver/StyleResolver.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 445fb9ac0a0f9faefbfca5f9779f9ebe479c7293..fd342613ea19d225c64ec20ef1ab92bd34b1ffb6 100644

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

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

@@ -254,9 +254,9 @@ FontWeight StyleBuilderConverter::convertFontWeight(StyleResolverState& state, c

const CSSPrimitiveValue& primitiveValue = toCSSPrimitiveValue(value);

switch (primitiveValue.getValueID()) {

case CSSValueBolder:

- return FontDescription::bolderWeight(state.parentStyle()->fontDescription().weight());

+ return FontDescription::bolderWeight(state.parentStyle()->getFontDescription().weight());

case CSSValueLighter:

- return FontDescription::lighterWeight(state.parentStyle()->fontDescription().weight());

+ return FontDescription::lighterWeight(state.parentStyle()->getFontDescription().weight());

default:

return primitiveValue.convertTo<FontWeight>();

}