diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-05-03 16:07:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-03 16:07:38 +0000 |
| commit | a4cbd6b13ce2891d31c57e9a77738059ef71149a (patch) | |
| tree | 0030306487cfe6cea4d68b0d736ccb5979121826 | |
| parent | c77150bf6e3e450096766a0c6200d2ead174ea49 (diff) | |
| parent | 6d0b3e2ec99c0d6c11faa12f207246ee83d042ac (diff) | |
| download | webview-a4cbd6b13ce2891d31c57e9a77738059ef71149a.tar.gz | |
Merge "Fix google-explicit-constructor warnings."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3
| -rw-r--r-- | chromium/plat_support/draw_gl_functor.cpp | 2 | ||||
| -rw-r--r-- | chromium/plat_support/graphics_utils.cpp | 2 |
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(); }; |