summaryrefslogtreecommitdiff
path: root/libs/hwui/SkiaCanvasProxy.h
diff options
context:
space:
mode:
author Chih-Hung Hsieh <chh@google.com> 2016-07-21 18:13:31 -0700
committer Chih-Hung Hsieh <chh@google.com> 2016-07-21 18:13:31 -0700
commit05160d70d14180fef3782a63dff2e822b51c3cf5 (patch)
tree4f8f6504761b71975a9c7a3790aef427f275fc8a /libs/hwui/SkiaCanvasProxy.h
parent95e42d97f4b5150db2dcf1c26b3b50e6e133d1e4 (diff)
parent5152fd909cf3bb9c7d27f0379f3dc1db619d2b8a (diff)
resolve merge conflicts of 5152fd9 to stage-aosp-master
Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3
Diffstat (limited to 'libs/hwui/SkiaCanvasProxy.h')
-rw-r--r--libs/hwui/SkiaCanvasProxy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/SkiaCanvasProxy.h b/libs/hwui/SkiaCanvasProxy.h
index 973c55fe2236..c03c523cd106 100644
--- a/libs/hwui/SkiaCanvasProxy.h
+++ b/libs/hwui/SkiaCanvasProxy.h
@@ -39,7 +39,7 @@ namespace uirenderer {
*/
class ANDROID_API SkiaCanvasProxy : public SkCanvas {
public:
- SkiaCanvasProxy(Canvas* canvas, bool filterHwuiCalls = false);
+ explicit SkiaCanvasProxy(Canvas* canvas, bool filterHwuiCalls = false);
virtual ~SkiaCanvasProxy() {}
protected: