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

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

Merge "Fix/suppress pipeline google-explicit-constructor warnings" am: 63790135 

am: 2cd94bae

Change-Id: I4163be5e021a4d14ba51985984b924e74ac324c2
parents 9b3671b1 2cd94bae

libs/hwui/pipeline/skia/SkiaPipeline.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ namespace skiapipeline { 


class SkiaPipeline : public renderthread::IRenderPipeline {

public:

    SkiaPipeline(renderthread::RenderThread& thread);

    explicit SkiaPipeline(renderthread::RenderThread& thread);

    virtual ~SkiaPipeline();



    TaskManager* getTaskManager() override;

libs/hwui/pipeline/skia/SkiaProfileRenderer.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ namespace uirenderer { 


class SkiaProfileRenderer : public IProfileRenderer {

public:

    SkiaProfileRenderer(SkCanvas* canvas) : mCanvas(canvas) {}

    explicit SkiaProfileRenderer(SkCanvas* canvas) : mCanvas(canvas) {}



    void drawRect(float left, float top, float right, float bottom, const SkPaint& paint) override;

    void drawRects(const float* rects, int count, const SkPaint& paint) override;

libs/hwui/pipeline/skia/SkiaVulkanPipeline.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ namespace skiapipeline { 


class SkiaVulkanPipeline : public SkiaPipeline {

public:

    SkiaVulkanPipeline(renderthread::RenderThread& thread);

    explicit SkiaVulkanPipeline(renderthread::RenderThread& thread);

    virtual ~SkiaVulkanPipeline() {}



    renderthread::MakeCurrentResult makeCurrent() override;

libs/hwui/pipeline/skia/VectorDrawableAtlas.h

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class VectorDrawableAtlas : public virtual RefBase { 
public:

    enum class StorageMode { allowSharedSurface, disallowSharedSurface };



    VectorDrawableAtlas(size_t surfaceArea,

    explicit VectorDrawableAtlas(size_t surfaceArea,

                                 StorageMode storageMode = StorageMode::allowSharedSurface);



    /**