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

Commit 9b5d427f authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev 

* commit '0b2dac34':
  Rename callDrawGLFunction
parents e9dbfe5a 0b2dac34

core/java/android/view/GLES20Canvas.java

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ class GLES20Canvas extends HardwareCanvas { 
    ///////////////////////////////////////////////////////////////////////////



    @Override

    public int callDrawGLFunction(long drawGLFunction) {

    public int callDrawGLFunction2(long drawGLFunction) {

        return nCallDrawGLFunction(mRenderer, drawGLFunction);

    }

core/java/android/view/HardwareCanvas.java

+1 −4
Original line number Diff line number Diff line
@@ -105,10 +105,7 @@ public abstract class HardwareCanvas extends Canvas { 
     *

     * @hide

     */

    public int callDrawGLFunction(long drawGLFunction) {

        // Noop - this is done in the display list recorder subclass

        return RenderNode.STATUS_DONE;

    }

    public abstract int callDrawGLFunction2(long drawGLFunction);



    public abstract void drawCircle(CanvasProperty<Float> cx, CanvasProperty<Float> cy,

            CanvasProperty<Float> radius, CanvasProperty<Paint> paint);

core/java/android/webkit/WebViewDelegate.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public final class WebViewDelegate { 
            throw new IllegalArgumentException(canvas.getClass().getName()

                    + " is not hardware accelerated");

        }

        ((HardwareCanvas) canvas).callDrawGLFunction(nativeDrawGLFunctor);

        ((HardwareCanvas) canvas).callDrawGLFunction2(nativeDrawGLFunctor);

    }



    /**