ui/gfx/render_text_mac.mm - Issue 1508893003: Use proper namespace in skia/ext

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: ui/gfx/render_text_mac.mm

Issue 1508893003: Use proper namespace in skia/ext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/gfx/render_text_mac.mm

diff --git a/ui/gfx/render_text_mac.mm b/ui/gfx/render_text_mac.mm

index 4e863a6bc9b2e2b12894fc12b9854a15eb18b392..d9a73fa160688269aacee8efd6026a4aa6211659 100644

--- a/ui/gfx/render_text_mac.mm

+++ b/ui/gfx/render_text_mac.mm

@@ -313,7 +313,7 @@ base::ScopedCFTypeRef<CFMutableArrayRef> RenderTextMac::ApplyStyles(

end = TextIndexToGivenTextIndex(text, style.GetRange().end());

const CFRange range = CFRangeMake(i, end - i);

base::ScopedCFTypeRef<CGColorRef> foreground(

- CGColorCreateFromSkColor(style.color()));

+ skia::CGColorCreateFromSkColor(style.color()));

CFAttributedStringSetAttribute(attr_string, range,

kCTForegroundColorAttributeName, foreground);

CFArrayAppendValue(attributes, foreground);

@@ -417,7 +417,7 @@ void RenderTextMac::ComputeRuns() {

const CGColorRef foreground = base::mac::GetValueFromDictionary<CGColorRef>(

attributes, kCTForegroundColorAttributeName);

if (foreground)

- run->foreground = CGColorRefToSkColor(foreground);

+ run->foreground = skia::CGColorRefToSkColor(foreground);

const CFNumberRef underline =

base::mac::GetValueFromDictionary<CFNumberRef>(