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

Commit a6fc36d4 authored by Daniel Chapin's avatar Daniel Chapin
Browse files

Revert "Fix leak in unclipped save layer" 

This reverts commit 8e068d5f.

Change-Id: Icd8ad5a2450db34aacecf748d6103df9faaa4c81
parent 8e068d5f

libs/hwui/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -233,7 +233,6 @@ LOCAL_SRC_FILES += \ 
    tests/unit/GpuMemoryTrackerTests.cpp \

    tests/unit/LayerUpdateQueueTests.cpp \

    tests/unit/LinearAllocatorTests.cpp \

    tests/unit/LeakCheckTests.cpp \

    tests/unit/VectorDrawableTests.cpp \

    tests/unit/OffscreenBufferPoolTests.cpp \

    tests/unit/StringUtilsTests.cpp

libs/hwui/BakedOpDispatcher.cpp

+0 −1
Original line number Diff line number Diff line
@@ -784,7 +784,6 @@ void BakedOpDispatcher::onCopyFromLayerOp(BakedOpRenderer& renderer, const CopyF 
                .build();

        renderer.renderGlop(state, glop);

    }

    renderer.renderState().layerPool().putOrDelete(*op.layerHandle);

}



} // namespace uirenderer

libs/hwui/tests/common/TestUtils.h

+0 −7
Original line number Diff line number Diff line
@@ -171,13 +171,6 @@ public: 
        syncHierarchyPropertiesAndDisplayListImpl(node.get());

    }



    static std::vector<sp<RenderNode>> createSyncedNodeList(sp<RenderNode>& node) {

        TestUtils::syncHierarchyPropertiesAndDisplayList(node);

        std::vector<sp<RenderNode>> vec;

        vec.emplace_back(node);

        return vec;

    }



    typedef std::function<void(renderthread::RenderThread& thread)> RtCallback;



    static void setRenderThreadCrashHandler(std::function<void()> crashHandler);

libs/hwui/tests/unit/FrameBuilderTests.cpp

+34 −27
Original line number Diff line number Diff line
@@ -32,6 +32,13 @@ namespace uirenderer { 
const LayerUpdateQueue sEmptyLayerUpdateQueue;

const Vector3 sLightCenter = {100, 100, 100};



static std::vector<sp<RenderNode>> createSyncedNodeList(sp<RenderNode>& node) {

    TestUtils::syncHierarchyPropertiesAndDisplayList(node);

    std::vector<sp<RenderNode>> vec;

    vec.emplace_back(node);

    return vec;

}



/**

 * Virtual class implemented by each test to redirect static operation / state transitions to

 * virtual methods.
@@ -132,7 +139,7 @@ TEST(FrameBuilder, simple) { 
        canvas.drawBitmap(bitmap, 10, 10, nullptr);

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    SimpleTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(4, renderer.getIndex()); // 2 ops + start + end
@@ -158,7 +165,7 @@ TEST(FrameBuilder, simpleStroke) { 
        canvas.drawPoint(50, 50, strokedPaint);

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 200), 100, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    SimpleStrokeTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(1, renderer.getIndex());
@@ -173,7 +180,7 @@ TEST(FrameBuilder, simpleRejection) { 
        canvas.restore();

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);



    FailRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);
@@ -208,7 +215,7 @@ TEST(FrameBuilder, simpleBatching) { 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    SimpleBatchingTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(2 * LOOPS, renderer.getIndex())
@@ -249,7 +256,7 @@ TEST(FrameBuilder, clippedMerging) { 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    ClippedMergingTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(4, renderer.getIndex());
@@ -277,7 +284,7 @@ TEST(FrameBuilder, textMerging) { 
        TestUtils::drawTextToCanvas(&canvas, "Test string1", paint, 100, 100); // not clipped

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(400, 400), 400, 400,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    TextMergingTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(2, renderer.getIndex()) << "Expect 2 ops";
@@ -308,7 +315,7 @@ TEST(FrameBuilder, textStrikethrough) { 
        }

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 2000), 200, 2000,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    TextStrikethroughTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(2 * LOOPS, renderer.getIndex())
@@ -342,7 +349,7 @@ RENDERTHREAD_TEST(FrameBuilder, textureLayer) { 
        canvas.restore();

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    TextureLayerTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(1, renderer.getIndex());
@@ -387,7 +394,7 @@ TEST(FrameBuilder, renderNode) { 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(parent), sLightCenter);

            createSyncedNodeList(parent), sLightCenter);

    RenderNodeTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

}
@@ -411,7 +418,7 @@ TEST(FrameBuilder, clipped) { 


    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue,

            SkRect::MakeLTRB(10, 20, 30, 40), // clip to small area, should see in receiver

            200, 200, TestUtils::createSyncedNodeList(node), sLightCenter);

            200, 200, createSyncedNodeList(node), sLightCenter);

    ClippedTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

}
@@ -453,7 +460,7 @@ TEST(FrameBuilder, saveLayer_simple) { 
        canvas.restore();

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    SaveLayerSimpleTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(4, renderer.getIndex());
@@ -525,7 +532,7 @@ TEST(FrameBuilder, saveLayer_nested) { 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(800, 800), 800, 800,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    SaveLayerNestedTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(10, renderer.getIndex());
@@ -545,7 +552,7 @@ TEST(FrameBuilder, saveLayer_contentRejection) { 
        canvas.restore();

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);



    FailRenderer renderer;

    // should see no ops, even within the layer, since the layer should be rejected
@@ -583,12 +590,12 @@ TEST(FrameBuilder, saveLayerUnclipped_simple) { 


    auto node = TestUtils::createNode(0, 0, 200, 200,

            [](RenderProperties& props, RecordingCanvas& canvas) {

        canvas.saveLayerAlpha(10, 10, 190, 190, 128, (SkCanvas::SaveFlags)(0));

        canvas.saveLayerAlpha(10, 10, 190, 190, 128, SkCanvas::kMatrixClip_SaveFlag);

        canvas.drawRect(0, 0, 200, 200, SkPaint());

        canvas.restore();

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    SaveLayerUnclippedSimpleTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(4, renderer.getIndex());
@@ -642,7 +649,7 @@ TEST(FrameBuilder, saveLayerUnclipped_mergedClears) { 
        canvas.restoreToCount(restoreTo);

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    SaveLayerUnclippedMergedClearsTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(10, renderer.getIndex())
@@ -704,7 +711,7 @@ TEST(FrameBuilder, saveLayerUnclipped_complex) { 
        canvas.restore();

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(600, 600), 600, 600,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    SaveLayerUnclippedComplexTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(12, renderer.getIndex());
@@ -755,7 +762,7 @@ RENDERTHREAD_TEST(FrameBuilder, hwLayer_simple) { 
    OffscreenBuffer layer(renderThread.renderState(), Caches::getInstance(), 100, 100);

    *layerHandle = &layer;



    auto syncedNodeList = TestUtils::createSyncedNodeList(node);

    auto syncedNodeList = createSyncedNodeList(node);



    // only enqueue partial damage

    LayerUpdateQueue layerUpdateQueue; // Note: enqueue damage post-sync, so bounds are valid
@@ -856,7 +863,7 @@ RENDERTHREAD_TEST(FrameBuilder, hwLayer_complex) { 
    OffscreenBuffer parentLayer(renderThread.renderState(), Caches::getInstance(), 200, 200);

    *(parent->getLayerHandle()) = &parentLayer;



    auto syncedList = TestUtils::createSyncedNodeList(parent);

    auto syncedList = createSyncedNodeList(parent);



    LayerUpdateQueue layerUpdateQueue; // Note: enqueue damage post-sync, so bounds are valid

    layerUpdateQueue.enqueueLayerWithDamage(child.get(), Rect(100, 100));
@@ -912,7 +919,7 @@ TEST(FrameBuilder, zReorder) { 
        drawOrderedNode(&canvas, 9, -10.0f); // in reorder=false at this point, so played inorder

    });

    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100,

            TestUtils::createSyncedNodeList(parent), sLightCenter);

            createSyncedNodeList(parent), sLightCenter);

    ZReorderTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(10, renderer.getIndex());
@@ -995,7 +1002,7 @@ TEST(FrameBuilder, projectionReorder) { 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 100, 100,

            TestUtils::createSyncedNodeList(parent), sLightCenter);

            createSyncedNodeList(parent), sLightCenter);

    ProjectionReorderTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(3, renderer.getIndex());
@@ -1038,7 +1045,7 @@ TEST(FrameBuilder, shadow) { 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(parent), sLightCenter);

            createSyncedNodeList(parent), sLightCenter);

    ShadowTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(2, renderer.getIndex());
@@ -1079,7 +1086,7 @@ TEST(FrameBuilder, shadowSaveLayer) { 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(parent), (Vector3) { 100, 100, 100 });

            createSyncedNodeList(parent), (Vector3) { 100, 100, 100 });

    ShadowSaveLayerTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(5, renderer.getIndex());
@@ -1125,7 +1132,7 @@ RENDERTHREAD_TEST(FrameBuilder, shadowHwLayer) { 
    layer.setWindowTransform(windowTransform);

    *layerHandle = &layer;



    auto syncedList = TestUtils::createSyncedNodeList(parent);

    auto syncedList = createSyncedNodeList(parent);

    LayerUpdateQueue layerUpdateQueue; // Note: enqueue damage post-sync, so bounds are valid

    layerUpdateQueue.enqueueLayerWithDamage(parent.get(), Rect(100, 100));

    FrameBuilder frameBuilder(layerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,
@@ -1158,7 +1165,7 @@ TEST(FrameBuilder, shadowLayering) { 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(parent), sLightCenter);

            createSyncedNodeList(parent), sLightCenter);

    ShadowLayeringTestRenderer renderer;

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(4, renderer.getIndex());
@@ -1186,7 +1193,7 @@ static void testProperty(std::function<void(RenderProperties&)> propSetupCallbac 
    });



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(100, 100), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

            createSyncedNodeList(node), sLightCenter);

    PropertyTestRenderer renderer(opValidateCallback);

    frameBuilder.replayBakedOps<TestDispatcher>(renderer);

    EXPECT_EQ(1, renderer.getIndex()) << "Should have seen one op";
@@ -1325,7 +1332,7 @@ void testSaveLayerAlphaClip(SaveLayerAlphaData* outObservedData, 
        paint.setColor(SK_ColorWHITE);

        canvas.drawRect(0, 0, 10000, 10000, paint);

    });

    auto nodes = TestUtils::createSyncedNodeList(node); // sync before querying height

    auto nodes = createSyncedNodeList(node); // sync before querying height



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200, nodes, sLightCenter);

    SaveLayerAlphaClipTestRenderer renderer(outObservedData);

libs/hwui/tests/unit/LeakCheckTests.cpp

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "BakedOpRenderer.h"

#include "BakedOpDispatcher.h"

#include "FrameBuilder.h"

#include "LayerUpdateQueue.h"

#include "RecordingCanvas.h"

#include "tests/common/TestUtils.h"



#include <gtest/gtest.h>



using namespace android;

using namespace android::uirenderer;



const LayerUpdateQueue sEmptyLayerUpdateQueue;

const Vector3 sLightCenter = {100, 100, 100};



RENDERTHREAD_TEST(LeakCheck, saveLayerUnclipped_simple) {

    auto node = TestUtils::createNode(0, 0, 200, 200,

            [](RenderProperties& props, RecordingCanvas& canvas) {

        canvas.saveLayerAlpha(10, 10, 190, 190, 128, (SkCanvas::SaveFlags)(0));

        canvas.drawRect(0, 0, 200, 200, SkPaint());

        canvas.restore();

    });

    BakedOpRenderer::LightInfo lightInfo = {50.0f, 128, 128 };

    RenderState& renderState = renderThread.renderState();

    Caches& caches = Caches::getInstance();



    FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 200), 200, 200,

            TestUtils::createSyncedNodeList(node), sLightCenter);

    BakedOpRenderer renderer(caches, renderState, true, lightInfo);

    frameBuilder.replayBakedOps<BakedOpDispatcher>(renderer);

}