third_party/WebKit/Source/platform/graphics/filters/FilterOperation.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/platform/graphics/filters/FilterOperation.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/platform/graphics/filters/FilterOperation.h ('k') | third_party/WebKit/Source/platform/graphics/filters/SkiaImageFilterBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp b/third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp

index de02f030a71952f95581c3c0ec0f3393234bf3c1..65ef29fb8c9578dbb46f5b362d04767c1ef36568 100644

--- a/third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp

+++ b/third_party/WebKit/Source/platform/graphics/filters/FilterOperation.cpp

@@ -143,7 +143,7 @@ PassRefPtrWillBeRawPtr<FilterOperation> DropShadowFilterOperation::blend(const F

return DropShadowFilterOperation::create(

blink::blend(fromOp->location(), m_location, progress),

blink::blend(fromOp->stdDeviation(), m_stdDeviation, progress),

- blink::blend(fromOp->color(), m_color, progress));

+ blink::blend(fromOp->getColor(), m_color, progress));

}

} // namespace blink