commit d51f85a20e45aa652b24751ee8fba4f96e5f5df8
author Chih-Hung Hsieh <chh@google.com> Tue May 03 16:17:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 16:17:35 2016 +0000
tree 4da3560f83a1848c976db7a5b219e0edcd5f3b25
parent 011a7c713d7af39f6b6269bda46a6b661fc91d1f
parent 6c28df3f4b446b5fe3c335723ee3f8fd1c07ce18

Merge "Fix google-explicit-constructor warnings." am: a4cbd6b13c am: 64f2136615
am: 6c28df3f4b

* commit '6c28df3f4b446b5fe3c335723ee3f8fd1c07ce18':
  Fix google-explicit-constructor warnings.

Change-Id: I64dbf5082ff5e08e56a4c8ee0571f3b921f9e1e7

chromium/plat_support/draw_gl_functor.cpp

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 @@
 
 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

chromium/plat_support/graphics_utils.cpp

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 @@
 
 class PixelInfo : public AwPixelInfo {
  public:
-  PixelInfo(SkCanvas* canvas);
+  explicit PixelInfo(SkCanvas* canvas);
   ~PixelInfo();
 };