Source/platform/fonts/skia/SimpleFontDataSkia.cpp - Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr.

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/platform/fonts/skia/SimpleFontDataSkia.cpp

Issue 170603003: Use nullptr_t for RefPtr, PassRefPtr and RawPtr. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Final rebase Created 6 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:

Index: Source/platform/fonts/skia/SimpleFontDataSkia.cpp

diff --git a/Source/platform/fonts/skia/SimpleFontDataSkia.cpp b/Source/platform/fonts/skia/SimpleFontDataSkia.cpp

index 99396f46504c0d6c4b9b5114e5ae108a68cba6c6..748bed89c36b7bb1cf9d647b8fb77c1a10932e40 100644

--- a/Source/platform/fonts/skia/SimpleFontDataSkia.cpp

+++ b/Source/platform/fonts/skia/SimpleFontDataSkia.cpp

@@ -198,7 +198,7 @@ void SimpleFontData::platformDestroy()

PassRefPtr<SimpleFontData> SimpleFontData::platformCreateScaledFontData(const FontDescription& fontDescription, float scaleFactor) const

{

const float scaledSize = lroundf(fontDescription.computedSize() * scaleFactor);

- return SimpleFontData::create(FontPlatformData(m_platformData, scaledSize), isCustomFont() ? CustomFontData::create(false) : 0);

+ return SimpleFontData::create(FontPlatformData(m_platformData, scaledSize), isCustomFont() ? CustomFontData::create(false) : nullptr);

}

void SimpleFontData::determinePitch()