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

Commit 63049197 authored by John Reck's avatar John Reck
Browse files

Unbreak display list debug dumping 

Change-Id: I1c6a79f047b29fa60907f6e128cb843a45b88bff
parent 1290d8e6

core/java/android/view/DisplayList.java

+8 −0
Original line number Diff line number Diff line
@@ -694,4 +694,12 @@ public abstract class DisplayList { 
     * @see View#offsetTopAndBottom(int)

     */

    public abstract void offsetTopAndBottom(float offset);



    /**

     * Outputs the display list to the log. This method exists for use by

     * tools to output display lists for selected nodes to the log.

     *

     * @hide

     */

    public abstract void output();

}

core/java/android/view/GLES20Canvas.java

+0 −7
Original line number Diff line number Diff line
@@ -408,13 +408,6 @@ class GLES20Canvas extends HardwareCanvas { 


    private static native int nGetDisplayList(int renderer, int displayList);



    @Override

    void outputDisplayList(DisplayList displayList) {

        nOutputDisplayList(mRenderer, ((GLES20DisplayList) displayList).getNativeDisplayList());

    }



    private static native void nOutputDisplayList(int renderer, int displayList);



    @Override

    public int drawDisplayList(DisplayList displayList, Rect dirty, int flags) {

        return nDrawDisplayList(mRenderer, ((GLES20DisplayList) displayList).getNativeDisplayList(),

core/java/android/view/GLES20DisplayList.java

+8 −0
Original line number Diff line number Diff line
@@ -440,6 +440,13 @@ class GLES20DisplayList extends DisplayList { 
        }

    }



    @Override

    public void output() {

        if (hasNativeDisplayList()) {

            nOutput(mFinalizer.mNativeDisplayList);

        }

    }



    private static native void nReset(int displayList);

    private static native void nOffsetTopAndBottom(int displayList, float offset);

    private static native void nOffsetLeftAndRight(int displayList, float offset);
@@ -487,6 +494,7 @@ class GLES20DisplayList extends DisplayList { 
    private static native float nGetRotationY(int displayList);

    private static native float nGetPivotX(int displayList);

    private static native float nGetPivotY(int displayList);

    private static native void nOutput(int displayList);



    ///////////////////////////////////////////////////////////////////////////

    // Finalization

core/java/android/view/HardwareCanvas.java

+0 −10
Original line number Diff line number Diff line
@@ -111,16 +111,6 @@ public abstract class HardwareCanvas extends Canvas { 
     */

    public abstract int drawDisplayList(DisplayList displayList, Rect dirty, int flags);



    /**

     * Outputs the specified display list to the log. This method exists for use by

     * tools to output display lists for selected nodes to the log.

     *

     * @param displayList The display list to be logged.

     *

     * @hide

     */

    abstract void outputDisplayList(DisplayList displayList);



    /**

     * Draws the specified layer onto this canvas.

     *

core/java/android/view/ViewRootImpl.java

+4 −8
Original line number Diff line number Diff line
@@ -2196,14 +2196,10 @@ public final class ViewRootImpl implements ViewParent, 
     * @hide

     */

    void outputDisplayList(View view) {

        // TODO - route through HardwareCanvas so it can be

        //        proxied to the correct thread

//        if (mAttachInfo != null && mAttachInfo.mHardwareCanvas != null) {

//            DisplayList displayList = view.getDisplayList();

//            if (displayList != null) {

//                mAttachInfo.mHardwareCanvas.outputDisplayList(displayList);

//            }

//        }

        DisplayList displayList = view.getDisplayList();

        if (displayList != null) {

            displayList.output();

        }

    }



    /**