gm/dftext.cpp - Issue 637953002: fix android framework build errors

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: gm/dftext.cpp

Issue 637953002: fix android framework build errors (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 2 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: gm/dftext.cpp

diff --git a/gm/dftext.cpp b/gm/dftext.cpp

index e36d58e845cf8ec1fc0560aa85af3999cd298f07..6f75c4671391af834412f8be0d87cd26bb10a6ec 100755

--- a/gm/dftext.cpp

+++ b/gm/dftext.cpp

@@ -41,7 +41,7 @@ protected:

}

virtual void onDraw(SkCanvas* inputCanvas) {

-#if SK_BUILD_FOR_ANDROID

+#ifdef SK_BUILD_FOR_ANDROID

SkScalar textSizes[] = { 9.0f, 9.0f*2.0f, 9.0f*5.0f, 9.0f*2.0f*5.0f };

#else

SkScalar textSizes[] = { 11.0f, 11.0f*2.0f, 11.0f*5.0f, 11.0f*2.0f*5.0f };

@@ -155,7 +155,7 @@ protected:

x = SkIntToScalar(680);

y = SkIntToScalar(270);

-#if SK_BUILD_FOR_ANDROID

+#ifdef SK_BUILD_FOR_ANDROID

paint.setTextSize(SkIntToScalar(19));

#else

paint.setTextSize(SkIntToScalar(22));

@@ -173,7 +173,7 @@ protected:

x = SkIntToScalar(830);

y = SkIntToScalar(270);

-#if SK_BUILD_FOR_ANDROID

+#ifdef SK_BUILD_FOR_ANDROID

paint.setTextSize(SkIntToScalar(19));

#else

paint.setTextSize(SkIntToScalar(22));

« no previous file with comments | « no previous file | no next file » | no next file with comments »