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

Commit 68325959 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix/suppress hwui/tests google-explicit-constructor warnings"

parents 1afa2c41 1c57378e

libs/hwui/tests/common/scenes/BitmapFillrate.cpp

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static bool _BitmapFillrate( 


class BitmapFillrate : public TestScene {

public:

    BitmapFillrate(BitmapAllocationTestUtils::BitmapAllocator allocator)

    explicit BitmapFillrate(BitmapAllocationTestUtils::BitmapAllocator allocator)

            : TestScene(), mAllocator(allocator) {}



    void createContent(int width, int height, Canvas& canvas) override {

libs/hwui/tests/common/scenes/BitmapShaders.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ static bool _BitmapShaders(BitmapAllocationTestUtils::registerBitmapAllocationSc 


class BitmapShaders : public TestScene {

public:

    BitmapShaders(BitmapAllocationTestUtils::BitmapAllocator allocator)

    explicit BitmapShaders(BitmapAllocationTestUtils::BitmapAllocator allocator)

            : TestScene(), mAllocator(allocator) {}



    sp<RenderNode> card;

libs/hwui/tests/common/scenes/TvApp.cpp

+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static bool _TvAppNoRoundedCornerColorFilter( 


class TvApp : public TestScene {

public:

    TvApp(BitmapAllocationTestUtils::BitmapAllocator allocator)

    explicit TvApp(BitmapAllocationTestUtils::BitmapAllocator allocator)

            : TestScene(), mAllocator(allocator) {}



    sp<RenderNode> mBg;
@@ -232,7 +232,7 @@ private: 


class TvAppNoRoundedCorner : public TvApp {

public:

    TvAppNoRoundedCorner(BitmapAllocationTestUtils::BitmapAllocator allocator) : TvApp(allocator) {}

    explicit TvAppNoRoundedCorner(BitmapAllocationTestUtils::BitmapAllocator allocator) : TvApp(allocator) {}



private:

    virtual float roundedCornerRadius() override { return dp(0); }
@@ -240,7 +240,7 @@ private: 


class TvAppColorFilter : public TvApp {

public:

    TvAppColorFilter(BitmapAllocationTestUtils::BitmapAllocator allocator) : TvApp(allocator) {}

    explicit TvAppColorFilter(BitmapAllocationTestUtils::BitmapAllocator allocator) : TvApp(allocator) {}



private:

    virtual bool useOverlay() override { return false; }
@@ -248,7 +248,7 @@ private: 


class TvAppNoRoundedCornerColorFilter : public TvApp {

public:

    TvAppNoRoundedCornerColorFilter(BitmapAllocationTestUtils::BitmapAllocator allocator)

    explicit TvAppNoRoundedCornerColorFilter(BitmapAllocationTestUtils::BitmapAllocator allocator)

            : TvApp(allocator) {}



private:

libs/hwui/tests/unit/SkiaRenderPropertiesTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void testProperty(std::function<void(RenderProperties&)> propSetupCallbac 
    static const int CANVAS_HEIGHT = 100;

    class PropertyTestCanvas : public TestCanvasBase {

    public:

        PropertyTestCanvas(std::function<void(const SkCanvas&)> callback)

        explicit PropertyTestCanvas(std::function<void(const SkCanvas&)> callback)

                : TestCanvasBase(CANVAS_WIDTH, CANVAS_HEIGHT), mCallback(callback) {}

        void onDrawRect(const SkRect& rect, const SkPaint& paint) override {

            EXPECT_EQ(mDrawCounter++, 0);

libs/hwui/tests/unit/ThreadBaseTests.cpp

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ TEST(ThreadBase, lifecyclePerf) { 
    };



    struct Counter {

        Counter(EventCount* count) : mCount(count) { mCount->construct++; }

        explicit Counter(EventCount* count) : mCount(count) { mCount->construct++; }



        Counter(const Counter& other) : mCount(other.mCount) {

            if (mCount) mCount->copy++;