third_party/WebKit/Source/platform/fonts/FontPlatformData.h - Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>.

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/fonts/FontPlatformData.h

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)

Patch Set: Rebasing... Created 4 years, 3 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/fonts/FontCustomPlatformData.cpp ('k') | third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/FontPlatformData.h

diff --git a/third_party/WebKit/Source/platform/fonts/FontPlatformData.h b/third_party/WebKit/Source/platform/fonts/FontPlatformData.h

index faf4636cfcb6d23a6c4163f88897ff05e21e36bd..7f5fa71d951982ecbd9ea3e5df18d679d860ba38 100644

--- a/third_party/WebKit/Source/platform/fonts/FontPlatformData.h

+++ b/third_party/WebKit/Source/platform/fonts/FontPlatformData.h

@@ -39,6 +39,7 @@

#include "platform/fonts/FontOrientation.h"

#include "platform/fonts/SmallCapsIterator.h"

#include "platform/fonts/opentype/OpenTypeVerticalData.h"

+#include "third_party/skia/include/core/SkRefCnt.h"

#include "wtf/Allocator.h"

#include "wtf/Forward.h"

#include "wtf/HashTableDeletedValueType.h"

@@ -87,7 +88,7 @@ public:

#if OS(MACOSX)

FontPlatformData(NSFont*, float size, bool syntheticBold = false, bool syntheticItalic = false, FontOrientation = FontOrientation::Horizontal);

#endif

- FontPlatformData(PassRefPtr<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = FontOrientation::Horizontal);

+ FontPlatformData(sk_sp<SkTypeface>, const char* name, float textSize, bool syntheticBold, bool syntheticItalic, FontOrientation = FontOrientation::Horizontal);

~FontPlatformData();

#if OS(MACOSX)

@@ -141,7 +142,7 @@ private:

void querySystemForRenderStyle();

#endif

- RefPtr<SkTypeface> m_typeface;

+ sk_sp<SkTypeface> m_typeface;

#if !OS(WIN)

CString m_family;

#endif