Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix/suppress pipeline google-explicit-constructor warnings"

Browse Source 
am: 63790135f4

Change-Id: Ib9487a1f14c98a7ec050c969381abfdd2407a792
This commit is contained in:
Chih-hung Hsieh
2018-12-21 08:46:34 -08:00
committed by android-build-merger
parent 668112800b 63790135f4
commit 2cd94bae8d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/pipeline/skia/SkiaPipeline.h
View File

@@ -30,7 +30,7 @@ namespace skiapipeline {
class SkiaPipeline : public renderthread::IRenderPipeline { class SkiaPipeline : public renderthread::IRenderPipeline {
public: public:
SkiaPipeline(renderthread::RenderThread& thread); explicit SkiaPipeline(renderthread::RenderThread& thread);
virtual ~SkiaPipeline(); virtual ~SkiaPipeline();
TaskManager* getTaskManager() override; TaskManager* getTaskManager() override;

2
libs/hwui/pipeline/skia/SkiaProfileRenderer.h
View File

@@ -23,7 +23,7 @@ namespace uirenderer {
class SkiaProfileRenderer : public IProfileRenderer { class SkiaProfileRenderer : public IProfileRenderer {
public: 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 drawRect(float left, float top, float right, float bottom, const SkPaint& paint) override;
void drawRects(const float* rects, int count, const SkPaint& paint) override; void drawRects(const float* rects, int count, const SkPaint& paint) override;

2
libs/hwui/pipeline/skia/SkiaVulkanPipeline.h
View File

@@ -25,7 +25,7 @@ namespace skiapipeline {
class SkiaVulkanPipeline : public SkiaPipeline { class SkiaVulkanPipeline : public SkiaPipeline {
public: public:
SkiaVulkanPipeline(renderthread::RenderThread& thread); explicit SkiaVulkanPipeline(renderthread::RenderThread& thread);
virtual ~SkiaVulkanPipeline() {} virtual ~SkiaVulkanPipeline() {}
renderthread::MakeCurrentResult makeCurrent() override; renderthread::MakeCurrentResult makeCurrent() override;

4
libs/hwui/pipeline/skia/VectorDrawableAtlas.h
View File

@@ -62,8 +62,8 @@ class VectorDrawableAtlas : public virtual RefBase {
public: public:
enum class StorageMode { allowSharedSurface, disallowSharedSurface }; enum class StorageMode { allowSharedSurface, disallowSharedSurface };
VectorDrawableAtlas(size_t surfaceArea, explicit VectorDrawableAtlas(size_t surfaceArea,
StorageMode storageMode = StorageMode::allowSharedSurface); StorageMode storageMode = StorageMode::allowSharedSurface);
/** /**
* "prepareForDraw" may allocate a new surface if needed. It may schedule to repack the * "prepareForDraw" may allocate a new surface if needed. It may schedule to repack the