summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2016-05-03 16:13:01 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-03 16:13:01 +0000
commit64f2136615ec46c0d22708299ce089a58354ce99 (patch)
tree0030306487cfe6cea4d68b0d736ccb5979121826
parentc77150bf6e3e450096766a0c6200d2ead174ea49 (diff)
parenta4cbd6b13ce2891d31c57e9a77738059ef71149a (diff)
downloadwebview-64f2136615ec46c0d22708299ce089a58354ce99.tar.gz
Merge "Fix google-explicit-constructor warnings."
am: a4cbd6b13c * commit 'a4cbd6b13ce2891d31c57e9a77738059ef71149a': Fix google-explicit-constructor warnings. Change-Id: I4da792e8a2036ba0970c7eceed599ad27ba03535
-rw-r--r--chromium/plat_support/draw_gl_functor.cpp2
-rw-r--r--chromium/plat_support/graphics_utils.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/plat_support/draw_gl_functor.cpp b/chromium/plat_support/draw_gl_functor.cpp
index a7fbe5b..c35d961 100644
--- a/chromium/plat_support/draw_gl_functor.cpp
+++ b/chromium/plat_support/draw_gl_functor.cpp
@@ -40,7 +40,7 @@ AwDrawGLFunction* g_aw_drawgl_function = NULL;
class DrawGLFunctor : public Functor {
public:
- DrawGLFunctor(jlong view_context) : view_context_(view_context) {}
+ explicit DrawGLFunctor(jlong view_context) : view_context_(view_context) {}
virtual ~DrawGLFunctor() {}
// Functor
diff --git a/chromium/plat_support/graphics_utils.cpp b/chromium/plat_support/graphics_utils.cpp
index 1e88c12..5d8d0a5 100644
--- a/chromium/plat_support/graphics_utils.cpp
+++ b/chromium/plat_support/graphics_utils.cpp
@@ -38,7 +38,7 @@ namespace {
class PixelInfo : public AwPixelInfo {
public:
- PixelInfo(SkCanvas* canvas);
+ explicit PixelInfo(SkCanvas* canvas);
~PixelInfo();
};