Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01069430 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am 03ad783c: Merge "Cleanup of libhwui" into jb-mr1-dev 

* commit '03ad783c':
  Cleanup of libhwui
parents 6eff50de 03ad783c

core/java/android/view/GLES20RenderLayer.java

+2 −8
Original line number Diff line number Diff line
@@ -82,17 +82,11 @@ class GLES20RenderLayer extends GLES20Layer { 
    }



    @Override

    void end(Canvas currentCanvas) {

        if (currentCanvas instanceof GLES20Canvas) {

            ((GLES20Canvas) currentCanvas).resume();

        }

    void end() {

    }



    @Override

    HardwareCanvas start(Canvas currentCanvas) {

        if (currentCanvas instanceof GLES20Canvas) {

            ((GLES20Canvas) currentCanvas).interrupt();

        }

    HardwareCanvas start() {

        return getCanvas();

    }

core/java/android/view/GLES20TextureLayer.java

+2 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.view;



import android.graphics.Canvas;

import android.graphics.Matrix;

import android.graphics.Rect;

import android.graphics.SurfaceTexture;
@@ -57,12 +56,12 @@ class GLES20TextureLayer extends GLES20Layer { 
    }



    @Override

    HardwareCanvas start(Canvas currentCanvas) {

    HardwareCanvas start() {

        return null;

    }



    @Override

    void end(Canvas currentCanvas) {

    void end() {

    }



    SurfaceTexture getSurfaceTexture() {

core/java/android/view/HardwareLayer.java

+2 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.view;



import android.graphics.Bitmap;

import android.graphics.Canvas;

import android.graphics.Matrix;

import android.graphics.Rect;
@@ -144,15 +143,13 @@ abstract class HardwareLayer { 


    /**

     * This must be invoked before drawing onto this layer.

     * @param currentCanvas

     */

    abstract HardwareCanvas start(Canvas currentCanvas);

    abstract HardwareCanvas start();

    

    /**

     * This must be invoked after drawing onto this layer.

     * @param currentCanvas

     */

    abstract void end(Canvas currentCanvas);

    abstract void end();



    /**

     * Copies this layer into the specified bitmap.

core/java/android/view/ViewRootImpl.java

+2 −3
Original line number Diff line number Diff line
@@ -1408,7 +1408,6 @@ public final class ViewRootImpl implements ViewParent, 
                        disposeResizeBuffer();



                        boolean completed = false;

                        HardwareCanvas hwRendererCanvas = mAttachInfo.mHardwareRenderer.getCanvas();

                        HardwareCanvas layerCanvas = null;

                        try {

                            if (mResizeBuffer == null) {
@@ -1418,7 +1417,7 @@ public final class ViewRootImpl implements ViewParent, 
                                    mResizeBuffer.getHeight() != mHeight) {

                                mResizeBuffer.resize(mWidth, mHeight);

                            }

                            layerCanvas = mResizeBuffer.start(hwRendererCanvas);

                            layerCanvas = mResizeBuffer.start();

                            layerCanvas.setViewport(mWidth, mHeight);

                            layerCanvas.onPreDraw(null);

                            final int restoreCount = layerCanvas.save();
@@ -1457,7 +1456,7 @@ public final class ViewRootImpl implements ViewParent, 
                                layerCanvas.onPostDraw();

                            }

                            if (mResizeBuffer != null) {

                                mResizeBuffer.end(hwRendererCanvas);

                                mResizeBuffer.end();

                                if (!completed) {

                                    mResizeBuffer.destroy();

                                    mResizeBuffer = null;

core/jni/android_view_GLES20Canvas.cpp

+0 −12
Original line number Diff line number Diff line
@@ -720,16 +720,6 @@ static void android_view_GLES20Canvas_outputDisplayList(JNIEnv* env, 
// Layers

// ----------------------------------------------------------------------------



static void android_view_GLES20Canvas_interrupt(JNIEnv* env, jobject clazz,

        OpenGLRenderer* renderer) {

    renderer->interrupt();

}



static void android_view_GLES20Canvas_resume(JNIEnv* env, jobject clazz,

        OpenGLRenderer* renderer) {

    renderer->resume();

}



static OpenGLRenderer* android_view_GLES20Canvas_createLayerRenderer(JNIEnv* env,

        jobject clazz, Layer* layer) {

    if (layer) {
@@ -972,8 +962,6 @@ static JNINativeMethod gMethods[] = { 
    { "nResetDisplayListRenderer",  "(I)V",    (void*) android_view_GLES20Canvas_resetDisplayListRenderer },



    { "nOutputDisplayList",      "(II)V",      (void*) android_view_GLES20Canvas_outputDisplayList },

    { "nInterrupt",              "(I)V",       (void*) android_view_GLES20Canvas_interrupt },

    { "nResume",                 "(I)V",       (void*) android_view_GLES20Canvas_resume },



    { "nCreateLayerRenderer",    "(I)I",       (void*) android_view_GLES20Canvas_createLayerRenderer },

    { "nCreateLayer",            "(IIZ[I)I",   (void*) android_view_GLES20Canvas_createLayer },