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

Commit 842f1e48 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562f 

am: d7a69e04

Change-Id: I78ea5c2e7036c5d5c7f5573b4eef208b0ff93b99
parents edd824b9 d7a69e04

libs/hwui/ClipArea.h

+5 −5
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ enum class ClipMode { 
};



struct ClipBase {

    ClipBase(ClipMode mode)

    explicit ClipBase(ClipMode mode)

            : mode(mode) {}

    ClipBase(const Rect& rect)

    explicit ClipBase(const Rect& rect)

            : mode(ClipMode::Rectangle)

            , rect(rect) {}

    const ClipMode mode;
@@ -112,19 +112,19 @@ struct ClipBase { 
};



struct ClipRect : ClipBase {

    ClipRect(const Rect& rect)

    explicit ClipRect(const Rect& rect)

            : ClipBase(rect) {}

};



struct ClipRectList : ClipBase {

    ClipRectList(const RectangleList& rectList)

    explicit ClipRectList(const RectangleList& rectList)

            : ClipBase(ClipMode::RectangleList)

            , rectList(rectList) {}

    RectangleList rectList;

};



struct ClipRegion : ClipBase {

    ClipRegion(const SkRegion& region)

    explicit ClipRegion(const SkRegion& region)

            : ClipBase(ClipMode::Region)

            , region(region) {}

    ClipRegion()

libs/hwui/DeferredLayerUpdater.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class DeferredLayerUpdater : public VirtualLightRefBase { 
public:

    // Note that DeferredLayerUpdater assumes it is taking ownership of the layer

    // and will not call incrementRef on it as a result.

    ANDROID_API DeferredLayerUpdater(Layer* layer);

    ANDROID_API explicit DeferredLayerUpdater(Layer* layer);

    ANDROID_API ~DeferredLayerUpdater();



    ANDROID_API bool setSize(int width, int height) {

libs/hwui/FontRenderer.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public: 


class FontRenderer {

public:

    FontRenderer(const uint8_t* gammaTable);

    explicit FontRenderer(const uint8_t* gammaTable);

    ~FontRenderer();



    void flushLargeCaches(std::vector<CacheTexture*>& cacheTextures);

libs/hwui/GpuMemoryTracker.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public: 
    static void onFrameCompleted();



protected:

    GpuMemoryTracker(GpuObjectType type) : mType(type) {

    explicit GpuMemoryTracker(GpuObjectType type) : mType(type) {

        ASSERT_GPU_THREAD();

        startTrackingObject();

    }

libs/hwui/PropertyValuesAnimatorSet.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ private: 


class PropertyAnimatorSetListener : public AnimationListener {

public:

    PropertyAnimatorSetListener(PropertyValuesAnimatorSet* set) : mSet(set) {}

    explicit PropertyAnimatorSetListener(PropertyValuesAnimatorSet* set) : mSet(set) {}

    virtual void onAnimationFinished(BaseRenderNodeAnimator* animator) override;



private: