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

Commit 32f140aa authored by John Reck's avatar John Reck
Browse files

Rename & package shuffle 

Rename DisplayListCanvas -> RecordingCanvas
Move RecordingCanvas to android.graphics
Move RenderNode to android.graphics

Bug: 112709971
Test: make & boot
Change-Id: Iddeb6a89f8923ea81a1f37bbee4e9b1db8ede238
parent b577f20c

apct-tests/perftests/core/src/android/graphics/perftests/CanvasPerfTest.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -17,14 +17,14 @@ 
package android.graphics.perftests;

package android.graphics.perftests;





import android.graphics.Bitmap;

import android.graphics.Bitmap;

import android.graphics.Color;

import android.graphics.Bitmap.Config;

import android.graphics.Bitmap.Config;

import android.graphics.Color;

import android.graphics.Paint;

import android.graphics.Paint;

import android.graphics.RecordingCanvas;

import android.graphics.RenderNode;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.support.test.filters.LargeTest;

import android.support.test.filters.LargeTest;

import android.view.DisplayListCanvas;

import android.view.RenderNode;





import org.junit.Rule;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;
@@ -43,7 +43,7 @@ public class CanvasPerfTest { 
        RenderNode child = RenderNode.create("child", null);

        RenderNode child = RenderNode.create("child", null);

        child.setLeftTopRightBottom(50, 50, 100, 100);

        child.setLeftTopRightBottom(50, 50, 100, 100);





        DisplayListCanvas canvas = node.start(100, 100);

        RecordingCanvas canvas = node.start(100, 100);

        node.end(canvas);

        node.end(canvas);

        canvas = child.start(50, 50);

        canvas = child.start(50, 50);

        canvas.drawColor(Color.WHITE);

        canvas.drawColor(Color.WHITE);
@@ -70,7 +70,7 @@ public class CanvasPerfTest { 
        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        RenderNode node = RenderNode.create("benchmark", null);

        RenderNode node = RenderNode.create("benchmark", null);





        DisplayListCanvas canvas = node.start(100, 100);

        RecordingCanvas canvas = node.start(100, 100);

        node.end(canvas);

        node.end(canvas);

        Bitmap bitmap = Bitmap.createBitmap(80, 80, Config.ARGB_8888);

        Bitmap bitmap = Bitmap.createBitmap(80, 80, Config.ARGB_8888);

        Paint paint = new Paint();

        Paint paint = new Paint();

apct-tests/perftests/core/src/android/graphics/perftests/OutlinePerfTest.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,6 @@ import android.graphics.Outline; 
import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.support.test.filters.LargeTest;

import android.support.test.filters.LargeTest;

import android.view.RenderNode;





import org.junit.Rule;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;

apct-tests/perftests/core/src/android/graphics/perftests/RenderNodePerfTest.java

+4 −6
Original line number Original line Diff line number Diff line
@@ -17,17 +17,15 @@ 
package android.graphics.perftests;

package android.graphics.perftests;





import android.graphics.Outline;

import android.graphics.Outline;

import android.graphics.RecordingCanvas;

import android.graphics.RenderNode;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.support.test.filters.LargeTest;

import android.support.test.filters.LargeTest;

import android.view.DisplayListCanvas;

import android.view.RenderNode;





import org.junit.Rule;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;





import java.util.ArrayList;



@LargeTest

@LargeTest

public class RenderNodePerfTest {

public class RenderNodePerfTest {

    @Rule

    @Rule
@@ -73,7 +71,7 @@ public class RenderNodePerfTest { 
        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        RenderNode node = RenderNode.create("LinearLayout", null);

        RenderNode node = RenderNode.create("LinearLayout", null);

        while (state.keepRunning()) {

        while (state.keepRunning()) {

            DisplayListCanvas canvas = node.start(100, 100);

            RecordingCanvas canvas = node.start(100, 100);

            node.end(canvas);

            node.end(canvas);

        }

        }

    }

    }
@@ -82,7 +80,7 @@ public class RenderNodePerfTest { 
    public void testStartEndDeepHierarchy() {

    public void testStartEndDeepHierarchy() {

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();

        RenderNode[] nodes = new RenderNode[30];

        RenderNode[] nodes = new RenderNode[30];

        DisplayListCanvas[] canvases = new DisplayListCanvas[nodes.length];

        RecordingCanvas[] canvases = new RecordingCanvas[nodes.length];

        for (int i = 0; i < nodes.length; i++) {

        for (int i = 0; i < nodes.length; i++) {

            nodes[i] = RenderNode.create("LinearLayout", null);

            nodes[i] = RenderNode.create("LinearLayout", null);

        }

        }

apct-tests/perftests/core/src/android/text/BoringLayoutCreateDrawPerfTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -18,12 +18,12 @@ package android.text; 
import static android.text.Layout.Alignment.ALIGN_NORMAL;

import static android.text.Layout.Alignment.ALIGN_NORMAL;





import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.RecordingCanvas;

import android.graphics.RenderNode;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.support.test.filters.LargeTest;

import android.support.test.filters.LargeTest;

import android.text.NonEditableTextGenerator.TextType;

import android.text.NonEditableTextGenerator.TextType;

import android.view.DisplayListCanvas;

import android.view.RenderNode;





import org.junit.Rule;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;
@@ -120,7 +120,7 @@ public class BoringLayoutCreateDrawPerfTest { 
        while (state.keepRunning()) {

        while (state.keepRunning()) {





            state.pauseTiming();

            state.pauseTiming();

            final DisplayListCanvas canvas = node.start(1200, 200);

            final RecordingCanvas canvas = node.start(1200, 200);

            final int save = canvas.save();

            final int save = canvas.save();

            if (!mCached) Canvas.freeTextLayoutCaches();

            if (!mCached) Canvas.freeTextLayoutCaches();

            state.resumeTiming();

            state.resumeTiming();

apct-tests/perftests/core/src/android/text/PaintMeasureDrawPerfTest.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -17,11 +17,11 @@ package android.text; 




import android.graphics.Canvas;

import android.graphics.Canvas;

import android.graphics.Paint;

import android.graphics.Paint;

import android.graphics.RecordingCanvas;

import android.graphics.RenderNode;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.BenchmarkState;

import android.perftests.utils.PerfStatusReporter;

import android.perftests.utils.PerfStatusReporter;

import android.support.test.filters.LargeTest;

import android.support.test.filters.LargeTest;

import android.view.DisplayListCanvas;

import android.view.RenderNode;





import org.junit.Rule;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;
@@ -107,7 +107,7 @@ public class PaintMeasureDrawPerfTest { 
        while (state.keepRunning()) {

        while (state.keepRunning()) {





            state.pauseTiming();

            state.pauseTiming();

            final DisplayListCanvas canvas = node.start(1200, 200);

            final RecordingCanvas canvas = node.start(1200, 200);

            final int save = canvas.save();

            final int save = canvas.save();

            if (!mCached) Canvas.freeTextLayoutCaches();

            if (!mCached) Canvas.freeTextLayoutCaches();

            state.resumeTiming();

            state.resumeTiming();