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

Commit 615c9464 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 8e1f9187: Merge "Switch DisplayListData to a staging model" 

* commit '8e1f9187':
  Switch DisplayListData to a staging model
parents 0e1a96a1 8e1f9187

core/java/android/view/GLRenderer.java

+2 −7
Original line number Diff line number Diff line
@@ -1226,11 +1226,6 @@ public class GLRenderer extends HardwareRenderer { 
        }

    }



    void setDisplayListData(long displayList, long newData) {

        nSetDisplayListData(displayList, newData);

    }

    private static native void nSetDisplayListData(long displayList, long newData);



    @Override

    void fence() {

        // Everything is immediate, so this is a no-op
@@ -1322,7 +1317,7 @@ public class GLRenderer extends HardwareRenderer { 
        }



        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "drawDisplayList");

        nUpdateRenderNodeProperties(displayList.getNativeDisplayList());

        nPushStagingChanges(displayList.getNativeDisplayList());

        try {

            status |= canvas.drawDisplayList(displayList, mRedrawClip,

                    RenderNode.FLAG_CLIP_CHILDREN);
@@ -1481,7 +1476,7 @@ public class GLRenderer extends HardwareRenderer { 


    static native void nDestroyLayer(long layerPtr);



    private static native void nUpdateRenderNodeProperties(long displayListPtr);

    private static native void nPushStagingChanges(long displayListPtr);



    class DrawPerformanceDataProvider extends GraphDataProvider {

        private final int mGraphType;

core/java/android/view/HardwareRenderer.java

+0 −2
Original line number Diff line number Diff line
@@ -580,8 +580,6 @@ public abstract class HardwareRenderer { 
        mRequested = requested;

    }



    abstract void setDisplayListData(long displayList, long newData);



    /**

     * Blocks until all previously queued work has completed.

     */

core/java/android/view/RenderNode.java

+120 −137

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/view/ThreadedRenderer.java

+0 −5
Original line number Diff line number Diff line
@@ -165,11 +165,6 @@ public class ThreadedRenderer extends HardwareRenderer { 
    public void repeatLastDraw() {

    }



    @Override

    void setDisplayListData(long displayList, long newData) {

        nSetDisplayListData(mNativeProxy, displayList, newData);

    }



    @Override

    void draw(View view, AttachInfo attachInfo, HardwareDrawCallbacks callbacks, Rect dirty) {

        attachInfo.mIgnoreDirtyState = true;

core/java/android/view/View.java

+3 −12

File changed.

Preview size limit exceeded, changes collapsed.