diff options
| author | 2016-07-21 18:13:31 -0700 | |
|---|---|---|
| committer | 2016-07-21 18:13:31 -0700 | |
| commit | 05160d70d14180fef3782a63dff2e822b51c3cf5 (patch) | |
| tree | 4f8f6504761b71975a9c7a3790aef427f275fc8a /libs/hwui/Texture.h | |
| parent | 95e42d97f4b5150db2dcf1c26b3b50e6e133d1e4 (diff) | |
| parent | 5152fd909cf3bb9c7d27f0379f3dc1db619d2b8a (diff) | |
resolve merge conflicts of 5152fd9 to stage-aosp-master
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
Diffstat (limited to 'libs/hwui/Texture.h')
| -rw-r--r-- | libs/hwui/Texture.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/Texture.h b/libs/hwui/Texture.h index 9749f734fd1f..b72742f45654 100644 --- a/libs/hwui/Texture.h +++ b/libs/hwui/Texture.h @@ -34,7 +34,7 @@ class Layer; */ class Texture : public GpuMemoryTracker { public: - Texture(Caches& caches) + explicit Texture(Caches& caches) : GpuMemoryTracker(GpuObjectType::Texture) , mCaches(caches) { } @@ -171,7 +171,7 @@ private: class AutoTexture { public: - AutoTexture(Texture* texture) + explicit AutoTexture(Texture* texture) : texture(texture) {} ~AutoTexture() { if (texture && texture->cleanup) { |