third_party/WebKit/Source/core/style/ComputedStyle.cpp - Issue 1729013002: blink: Rename enums and functions to not collide with chromium 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/style/ComputedStyle.cpp

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: get-names-3: . 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/paint/TextPainterTest.cpp ('k') | third_party/WebKit/Source/core/svg/SVGAnimatedColor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/style/ComputedStyle.cpp

diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.cpp b/third_party/WebKit/Source/core/style/ComputedStyle.cpp

index 42d731c520679077eddd28a2cc41662c8ef1fc8d..491e4fa8e40da14f454c0a0ce4b256c5bfcb3e0a 100644

--- a/third_party/WebKit/Source/core/style/ComputedStyle.cpp

+++ b/third_party/WebKit/Source/core/style/ComputedStyle.cpp

@@ -1499,7 +1499,7 @@ StyleColor ComputedStyle::decorationColorIncludingFallback(bool visitedLink) con

if (textStrokeWidth()) {

// Prefer stroke color if possible, but not if it's fully transparent.

StyleColor textStrokeStyleColor = visitedLink ? visitedLinkTextStrokeColor() : textStrokeColor();

- if (!textStrokeStyleColor.isCurrentColor() && textStrokeStyleColor.color().alpha())

+ if (!textStrokeStyleColor.isCurrentColor() && textStrokeStyleColor.getColor().alpha())

return textStrokeStyleColor;

}

@@ -1569,7 +1569,7 @@ Color ComputedStyle::colorIncludingFallback(int colorProperty, bool visitedLink)

}

if (!result.isCurrentColor())

- return result.color();

+ return result.getColor();

// FIXME: Treating styled borders with initial color differently causes problems

// See crbug.com/316559, crbug.com/276231