src/animator/SkDrawPaint.cpp - Issue 1933393002: Move SkTypeface to sk_sp.

Side by Side Diff

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

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

Side by Side Diff: src/animator/SkDrawPaint.cpp

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

Patch Set: Restore deleted Android code. Created 4 years, 7 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 unified diff | Download patch

« no previous file with comments | « samplecode/SampleXfermodesBlur.cpp ('k') | src/animator/SkPaintPart.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright 2006 The Android Open Source Project	2 * Copyright 2006 The Android Open Source Project

3 *	3 *

4 * Use of this source code is governed by a BSD-style license that can be	4 * Use of this source code is governed by a BSD-style license that can be

5 * found in the LICENSE file.	5 * found in the LICENSE file.

6 */	6 */

7	7

8 #include "SkDrawPaint.h"	8 #include "SkDrawPaint.h"

9 #include "SkAnimateMaker.h"	9 #include "SkAnimateMaker.h"

10 #include "SkDrawColor.h"	10 #include "SkDrawColor.h"

(...skipping 241 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
252 paint->setTextAlign((SkPaint::Align) textAlign);	252 paint->setTextAlign((SkPaint::Align) textAlign);

253 if (SkScalarIsNaN(textScaleX) == false)	253 if (SkScalarIsNaN(textScaleX) == false)

254 paint->setTextScaleX(textScaleX);	254 paint->setTextScaleX(textScaleX);

255 if (SkScalarIsNaN(textSize) == false)	255 if (SkScalarIsNaN(textSize) == false)

256 paint->setTextSize(textSize);	256 paint->setTextSize(textSize);

257 if (SkScalarIsNaN(textSkewX) == false)	257 if (SkScalarIsNaN(textSkewX) == false)

258 paint->setTextSkewX(textSkewX);	258 paint->setTextSkewX(textSkewX);

259 if (typeface == nullptr)	259 if (typeface == nullptr)

260 paint->setTypeface(nullptr);	260 paint->setTypeface(nullptr);

261 else if (typeface != (SkDrawTypeface*) -1)	261 else if (typeface != (SkDrawTypeface*) -1)

262 SkSafeUnref(paint->setTypeface(typeface->getTypeface()));	262 paint->setTypeface(typeface->getTypeface());

263 if (underline != -1)	263 if (underline != -1)

264 paint->setUnderlineText(SkToBool(underline));	264 paint->setUnderlineText(SkToBool(underline));

265 if (xfermode != -1)	265 if (xfermode != -1)

266 paint->setXfermodeMode((SkXfermode::Mode) xfermode);	266 paint->setXfermodeMode((SkXfermode::Mode) xfermode);

267 }	267 }

OLD	NEW