commit 6ba30b85ddfbe37c338ee8dde3dd33322eb38d47
author Behdad Esfahbod <behdad@google.com> Tue Jul 15 16:22:32 2014 -0400
committer Behdad Esfahbod <behdad@google.com> Tue Jul 22 14:01:09 2014 -0400
tree 2932b2c164821f37e2e1e71df15bc3a242d9e616
parent ad88e1b1b2c57fa56bde68764b22240d145fa0ef

Add android.Paint that inherits SkPaint

The idea is that extra paint parameters that only affect text layout
(not rendering) will go in android.Paint instead of going into
SkPaintOptionsAndroid.  We will eventually move those out of SkPaint
too.

This is currently implemented in PaintImpl.cpp.  Will be renamed when
current Paint.cpp that has JNI bits is moved to android_graphics_Paint.cpp.

Change-Id: Iba66c34dea5da503a13b9c864cb9f2211ac4ba7d

core/jni/android/graphics/Bitmap.cpp

diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 53aca3d..c0f7b4d 100644
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -1,3 +1,4 @@
+#include "Paint.h"
 #include "SkBitmap.h"
 #include "SkPixelRef.h"
 #include "SkImageEncoder.h"
@@ -676,7 +677,7 @@
                                    jlong srcHandle, jlong paintHandle,
                                    jintArray offsetXY) {
     const SkBitmap* src = reinterpret_cast<SkBitmap*>(srcHandle);
-    const SkPaint* paint = reinterpret_cast<SkPaint*>(paintHandle);
+    const android::Paint* paint = reinterpret_cast<android::Paint*>(paintHandle);
     SkIPoint  offset;
     SkBitmap* dst = new SkBitmap;
     JavaPixelAllocator allocator(env);