diff options
| author | Chris Craik <ccraik@google.com> | 2015-04-28 21:39:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-28 21:39:49 +0000 |
| commit | ff623a5ab3b26cd98790e355e316a65d76197cbd (patch) | |
| tree | 44a26f11cb0dfb5b6ca9f933b276e7f571a96435 /core/jni | |
| parent | aadac158bfd533e00b92374afee066bcba22b988 (diff) | |
| parent | 956f340aacc7d8fc2d10f776551f13fde2d8d3ab (diff) | |
| download | frameworks_base-ff623a5ab3b26cd98790e355e316a65d76197cbd.zip frameworks_base-ff623a5ab3b26cd98790e355e316a65d76197cbd.tar.gz frameworks_base-ff623a5ab3b26cd98790e355e316a65d76197cbd.tar.bz2 | |
Merge "Remove unused flags and dirty rects" into mnc-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_view_DisplayListCanvas.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/core/jni/android_view_DisplayListCanvas.cpp b/core/jni/android_view_DisplayListCanvas.cpp index 6bcc92e..a362684 100644 --- a/core/jni/android_view_DisplayListCanvas.cpp +++ b/core/jni/android_view_DisplayListCanvas.cpp @@ -112,8 +112,7 @@ static void android_view_DisplayListCanvas_callDrawGLFunction(JNIEnv* env, jobje jlong rendererPtr, jlong functorPtr) { DisplayListCanvas* renderer = reinterpret_cast<DisplayListCanvas*>(rendererPtr); Functor* functor = reinterpret_cast<Functor*>(functorPtr); - android::uirenderer::Rect dirty; - renderer->callDrawGLFunction(functor, dirty); + renderer->callDrawGLFunction(functor); } // ---------------------------------------------------------------------------- @@ -212,12 +211,10 @@ static jlong android_view_DisplayListCanvas_createDisplayListCanvas(JNIEnv* env, } static void android_view_DisplayListCanvas_drawRenderNode(JNIEnv* env, - jobject clazz, jlong rendererPtr, jlong renderNodePtr, - jint flags) { + jobject clazz, jlong rendererPtr, jlong renderNodePtr) { DisplayListCanvas* renderer = reinterpret_cast<DisplayListCanvas*>(rendererPtr); RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr); - android::uirenderer::Rect bounds; - renderer->drawRenderNode(renderNode, bounds, flags); + renderer->drawRenderNode(renderNode); } // ---------------------------------------------------------------------------- @@ -283,7 +280,7 @@ static JNINativeMethod gMethods[] = { { "nDrawCircle", "(JJJJJ)V", (void*) android_view_DisplayListCanvas_drawCircleProps }, { "nFinishRecording", "(J)J", (void*) android_view_DisplayListCanvas_finishRecording }, - { "nDrawRenderNode", "(JJI)V", (void*) android_view_DisplayListCanvas_drawRenderNode }, + { "nDrawRenderNode", "(JJ)V", (void*) android_view_DisplayListCanvas_drawRenderNode }, { "nCreateDisplayListCanvas", "()J", (void*) android_view_DisplayListCanvas_createDisplayListCanvas }, |