diff options
author | 2018-12-21 09:15:12 -0800 | |
---|---|---|
committer | 2018-12-21 09:15:12 -0800 | |
commit | 34ba791b2576047c188370b57ff391f8d3891a25 (patch) | |
tree | b6eeb716582208cc436584a50e2c57ec73931d97 | |
parent | 5f175e3d6f71429a80a6506810fc3348d541123a (diff) | |
parent | b6ecc7ca924f041acb0bbd9d7b0e644ca57425ae (diff) |
Merge "Fix/suppress pipeline google-explicit-constructor warnings" am: 63790135f4 am: 2cd94bae8d
am: b6ecc7ca92
Change-Id: If3fedf4175cf7dd992817677a0bd45ad9d5335ea
-rw-r--r-- | libs/hwui/pipeline/skia/SkiaPipeline.h | 2 | ||||
-rw-r--r-- | libs/hwui/pipeline/skia/SkiaProfileRenderer.h | 2 | ||||
-rw-r--r-- | libs/hwui/pipeline/skia/SkiaVulkanPipeline.h | 2 | ||||
-rw-r--r-- | libs/hwui/pipeline/skia/VectorDrawableAtlas.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libs/hwui/pipeline/skia/SkiaPipeline.h b/libs/hwui/pipeline/skia/SkiaPipeline.h index f2906de4d5a0..ff873133c6fb 100644 --- a/libs/hwui/pipeline/skia/SkiaPipeline.h +++ b/libs/hwui/pipeline/skia/SkiaPipeline.h @@ -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; diff --git a/libs/hwui/pipeline/skia/SkiaProfileRenderer.h b/libs/hwui/pipeline/skia/SkiaProfileRenderer.h index daa4c1839693..dc8420f4e01b 100644 --- a/libs/hwui/pipeline/skia/SkiaProfileRenderer.h +++ b/libs/hwui/pipeline/skia/SkiaProfileRenderer.h @@ -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; diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h index 02874c7d2c69..53ffc4422fd7 100644 --- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h +++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h @@ -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; diff --git a/libs/hwui/pipeline/skia/VectorDrawableAtlas.h b/libs/hwui/pipeline/skia/VectorDrawableAtlas.h index 74e48cea2a87..5e892aa7e92c 100644 --- a/libs/hwui/pipeline/skia/VectorDrawableAtlas.h +++ b/libs/hwui/pipeline/skia/VectorDrawableAtlas.h @@ -62,8 +62,8 @@ class VectorDrawableAtlas : public virtual RefBase { public: enum class StorageMode { allowSharedSurface, disallowSharedSurface }; - VectorDrawableAtlas(size_t surfaceArea, - StorageMode storageMode = StorageMode::allowSharedSurface); + explicit VectorDrawableAtlas(size_t surfaceArea, + StorageMode storageMode = StorageMode::allowSharedSurface); /** * "prepareForDraw" may allocate a new surface if needed. It may schedule to repack the |