samplecode/SampleApp.cpp - Issue 1933393002: Move SkTypeface to sk_sp.

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: samplecode/SampleApp.cpp

Issue 1933393002: Move SkTypeface to sk_sp. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Make vc++ happy. Created 4 years, 8 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: samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp

index ba2e6ccad1a2fb301e12bb87f5132ef1e4a261da..e2ea0e0e7e58f9b6917aafb1ddc56def5c65c5e7 100644

--- a/samplecode/SampleApp.cpp

+++ b/samplecode/SampleApp.cpp

@@ -915,7 +915,7 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev

fMouseX = fMouseY = 0;

fFatBitsScale = 8;

- fTypeface = SkTypeface::CreateFromTypeface(nullptr, SkTypeface::kBold);

+ fTypeface = SkTypeface::MakeFromTypeface(nullptr, SkTypeface::kBold);

fShowZoomer = false;

fZoomLevel = 0;

@@ -1041,7 +1041,6 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev

}

SampleWindow::~SampleWindow() {

- SkSafeUnref(fTypeface);

SkSafeUnref(fDevManager);

}