diff options
| author | Jonathan Dixon <joth@google.com> | 2013-08-02 15:28:31 -0700 |
|---|---|---|
| committer | Jonathan Dixon <joth@google.com> | 2013-08-08 17:22:48 -0700 |
| commit | 667fe1039feae068d3333de8fb7115313f4a517b (patch) | |
| tree | cbe42efc3390b4f8bce6854573d7073e698b2dae /core/jni/android/graphics/Canvas.cpp | |
| parent | f6971c80fd413cad8e5333cd3184f41fcf64e14b (diff) | |
| download | frameworks_base-667fe1039feae068d3333de8fb7115313f4a517b.zip frameworks_base-667fe1039feae068d3333de8fb7115313f4a517b.tar.gz frameworks_base-667fe1039feae068d3333de8fb7115313f4a517b.tar.bz2 | |
Refactor Canvas.drawPicture() to delegate to Picture
Bug: 9814370
To allow WebView.capturePicture() to return a subclass, we need to
ensure the subclass is always consulted when being drawn into a canvas.
Change-Id: Ia0357f95b6fafb3ac81e6bcfaef05739e619897a
Diffstat (limited to 'core/jni/android/graphics/Canvas.cpp')
| -rw-r--r-- | core/jni/android/graphics/Canvas.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 3308064..6c4526e 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -35,8 +35,6 @@ #include <utils/Log.h> -#define TIME_DRAWx - static uint32_t get_thread_msec() { #if defined(HAVE_POSIX_CLOCKS) struct timespec tm; @@ -463,20 +461,6 @@ public: canvas->drawPath(*path, *paint); } - static void drawPicture(JNIEnv* env, jobject, SkCanvas* canvas, - SkPicture* picture) { - SkASSERT(canvas); - SkASSERT(picture); - -#ifdef TIME_DRAW - SkMSec now = get_thread_msec(); //SkTime::GetMSecs(); -#endif - canvas->drawPicture(*picture); -#ifdef TIME_DRAW - ALOGD("---- picture playback %d ms\n", get_thread_msec() - now); -#endif - } - static void drawBitmap__BitmapFFPaint(JNIEnv* env, jobject jcanvas, SkCanvas* canvas, SkBitmap* bitmap, jfloat left, jfloat top, @@ -1103,7 +1087,6 @@ static JNINativeMethod gCanvasMethods[] = { (void*) SkCanvasGlue::drawTextOnPath___CIIPathFFPaint}, {"native_drawTextOnPath","(ILjava/lang/String;IFFII)V", (void*) SkCanvasGlue::drawTextOnPath__StringPathFFPaint}, - {"native_drawPicture", "(II)V", (void*) SkCanvasGlue::drawPicture}, {"freeCaches", "()V", (void*) SkCanvasGlue::freeCaches}, |