summaryrefslogtreecommitdiff
path: root/libs/hwui/VectorDrawable.h
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2016-09-01 01:26:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-09-01 01:26:40 +0000
commit25c9f6cede5705406294a5043363952c316facb2 (patch)
tree8474859828713a024080ed5bb817374157f846d6 /libs/hwui/VectorDrawable.h
parent2378ff89f4d9f4f2cb4595ba46fa3a2010c51961 (diff)
parent1f50f80aab31600406c7b93a1630d396228983f0 (diff)
Merge "Fix google-explicit-constructor warnings in libs/hwui." am: 7207562ff7 am: d7a69e04eb am: 842f1e48e7
am: 1f50f80aab Change-Id: I713bd07fee150cc684e630045e02872b23062a5a
Diffstat (limited to 'libs/hwui/VectorDrawable.h')
-rw-r--r--libs/hwui/VectorDrawable.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/hwui/VectorDrawable.h b/libs/hwui/VectorDrawable.h
index cf77cbbaff94..e68fbf4c6243 100644
--- a/libs/hwui/VectorDrawable.h
+++ b/libs/hwui/VectorDrawable.h
@@ -97,7 +97,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);
}
@@ -139,7 +139,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();
@@ -225,7 +225,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);
@@ -416,7 +416,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;
@@ -546,7 +546,7 @@ private:
class ANDROID_API Tree : public VirtualLightRefBase {
public:
- Tree(Group* rootNode) : mRootNode(rootNode) {
+ explicit Tree(Group* rootNode) : mRootNode(rootNode) {
mRootNode->setPropertyChangedListener(&mPropertyChangedListener);
}
@@ -583,7 +583,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 {