diff options
author | Chih-hung Hsieh <chh@google.com> | 2016-08-31 17:43:44 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-31 17:43:44 +0000 |
commit | 1f50f80aab31600406c7b93a1630d396228983f0 (patch) | |
tree | adbc220e05240c6ff92e67865ff446ac0b0a3b46 /libs/hwui/VectorDrawable.h | |
parent | d835145d2fd86ab486427e305b4e1c03e7c4e6f4 (diff) | |
parent | 842f1e48e7c06de4da1b467f83fc625eaa6348a4 (diff) |
Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb
am: 842f1e48e7
Change-Id: I401bb7ef3a46bb317ba664667fab4a16c129e5aa
Diffstat (limited to 'libs/hwui/VectorDrawable.h')
-rw-r--r-- | libs/hwui/VectorDrawable.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/hwui/VectorDrawable.h b/libs/hwui/VectorDrawable.h index a0c3d9db8ae1..6c1815fe1301 100644 --- a/libs/hwui/VectorDrawable.h +++ b/libs/hwui/VectorDrawable.h @@ -90,7 +90,7 @@ class ANDROID_API Node { public: class Properties { public: - Properties(Node* node) : mNode(node) {} + explicit Properties(Node* node) : mNode(node) {} inline void onPropertyChanged() { mNode->onPropertyChanged(this); } @@ -132,7 +132,7 @@ public: class PathProperties : public Properties { public: - PathProperties(Node* node) : Properties(node) {} + explicit PathProperties(Node* node) : Properties(node) {} void syncProperties(const PathProperties& prop) { mData = prop.mData; onPropertyChanged(); @@ -218,7 +218,7 @@ public: float strokeMiterLimit = 4; int fillType = 0; /* non-zero or kWinding_FillType in Skia */ }; - FullPathProperties(Node* mNode) : Properties(mNode), mTrimDirty(false) {} + explicit FullPathProperties(Node* mNode) : Properties(mNode), mTrimDirty(false) {} ~FullPathProperties() { SkSafeUnref(fillGradient); SkSafeUnref(strokeGradient); @@ -409,7 +409,7 @@ class ANDROID_API Group: public Node { public: class GroupProperties : public Properties { public: - GroupProperties(Node* mNode) : Properties(mNode) {} + explicit GroupProperties(Node* mNode) : Properties(mNode) {} struct PrimitiveFields { float rotate = 0; float pivotX = 0; @@ -539,7 +539,7 @@ private: class ANDROID_API Tree : public VirtualLightRefBase { public: - Tree(Group* rootNode) : mRootNode(rootNode) { + explicit Tree(Group* rootNode) : mRootNode(rootNode) { mRootNode->setPropertyChangedListener(&mPropertyChangedListener); } @@ -576,7 +576,7 @@ public: class TreeProperties { public: - TreeProperties(Tree* tree) : mTree(tree) {} + explicit TreeProperties(Tree* tree) : mTree(tree) {} // Properties that can only be modified by UI thread, therefore sync should // only go from UI to RT struct NonAnimatableProperties { |