Source/web/mac/WebSubstringUtil.mm - Issue 879533003: Remove Mac native font type members from FontPlatformData

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: Source/web/mac/WebSubstringUtil.mm

Issue 879533003: Remove Mac native font type members from FontPlatformData (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Memory management review comments addressed Created 5 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

Index: Source/web/mac/WebSubstringUtil.mm

diff --git a/Source/web/mac/WebSubstringUtil.mm b/Source/web/mac/WebSubstringUtil.mm

index 07923b5b6d48ecf73133c7170c4cb49d53547b04..b2c4729586ac6776b5ddca0f46cf951f86947764 100644

--- a/Source/web/mac/WebSubstringUtil.mm

+++ b/Source/web/mac/WebSubstringUtil.mm

@@ -78,7 +78,8 @@ static NSAttributedString* attributedSubstringFromRange(const Range* range)

continue;

LayoutStyle* style = renderer->style();

- NSFont* font = style->font().primaryFont()->getNSFont();

+ const FontPlatformData& fontPlatformData = style->font().primaryFont()->platformData();

+ const NSFont* font = reinterpret_cast<const NSFont*>(fontPlatformData.ctFont());

Robert Sesek 2015/03/19 21:53:45 NSObjects are never const.

Dominik Röttsches 2015/03/20 11:01:07 Changed to NSFont* - however, as above, the nested

// If the platform font can't be loaded, it's likely that the site is

// using a web font. For now, just use the default font instead.

// TODO(rsesek): Change the font activation flags to allow other processes

« Source/platform/fonts/mac/FontPlatformDataMac.mm ('K') | « Source/platform/fonts/skia/FontCustomPlatformDataSkia.cpp ('k') | no next file » | no next file with comments »