ui/gfx: Fix the following warnings found by cpplint.
With the following command line:
$ cpplint.py ui/gfx/* 2>&1 | grep "should be"
ui/gfx/canvas.h:185: Extra space before last semicolon. If this should be an empty statement, use { } instead. [whitespace/semicolon] [5]
ui/gfx/canvas_paint_win.cc:17: Single-argument constructors should be marked explicit. [runtime/explicit] [5]
ui/gfx/color_analysis_unittest.cc:90: Single-argument constructors should be marked explicit. [runtime/explicit] [5]
ui/gfx/interpolated_transform.h:266: #endif line should be "#endif // UI_GFX_INTERPOLATED_TRANSFORM_H_" [build/header_guard] [5]
ui/gfx/interpolated_transform.h:198: Single-argument constructors should be marked explicit. [runtime/explicit] [5]
ui/gfx/point3.h:21: Single-argument constructors should be marked explicit. [runtime/explicit] [5]
ui/gfx/point_conversions.h:21: #endif line should be "#endif // UI_GFX_POINT_CONVERSIONS_H_" [build/header_guard] [5]
ui/gfx/scoped_cg_context_save_gstate_mac.h:30: #endif line should be "#endif // UI_GFX_SCOPED_CG_CONTEXT_SAVE_GSTATE_MAC_H_" [build/header_guard] [5]
ui/gfx/scoped_sk_region.h:45: #endif line should be "#endif // UI_GFX_SCOPED_SK_REGION_H_" [build/header_guard] [5]
ui/gfx/size_conversions.h:24: #endif line should be "#endif // UI_GFX_SIZE_CONVERSIONS_H_" [build/header_guard] [5]
[email protected]
TEST=ui_unittest
Review URL: https://codereview.chromium.org/11264016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164077 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/gfx/canvas.h b/ui/gfx/canvas.h
index 16d7ae5..4660407c 100644
--- a/ui/gfx/canvas.h
+++ b/ui/gfx/canvas.h
@@ -182,7 +182,7 @@
// Restores the drawing state after a call to Save*(). It is an error to
// call Restore() more times than Save*().
- void Restore() ;
+ void Restore();
// Adds |rect| to the current clip. Returns true if the resulting clip is
// non-empty.
diff --git a/ui/gfx/canvas_paint_win.cc b/ui/gfx/canvas_paint_win.cc
index 8bafe6d..87ba3f6 100644
--- a/ui/gfx/canvas_paint_win.cc
+++ b/ui/gfx/canvas_paint_win.cc
@@ -14,7 +14,7 @@
#if !defined(USE_AURA)
class CanvasPaintWin : public gfx::CanvasPaint, public gfx::CanvasSkiaPaint {
public:
- CanvasPaintWin(gfx::NativeView view);
+ explicit CanvasPaintWin(gfx::NativeView view);
virtual ~CanvasPaintWin();
// Overridden from CanvasPaint:
diff --git a/ui/gfx/color_analysis_unittest.cc b/ui/gfx/color_analysis_unittest.cc
index 9bdf091..dca29fbe 100644
--- a/ui/gfx/color_analysis_unittest.cc
+++ b/ui/gfx/color_analysis_unittest.cc
@@ -87,9 +87,9 @@
MockKMeanImageSampler() : current_result_index_(0) {
}
- MockKMeanImageSampler(const std::vector<int>& samples)
- : prebaked_sample_results_(samples),
- current_result_index_(0) {
+ explicit MockKMeanImageSampler(const std::vector<int>& samples)
+ : prebaked_sample_results_(samples),
+ current_result_index_(0) {
}
virtual ~MockKMeanImageSampler() {
diff --git a/ui/gfx/interpolated_transform.h b/ui/gfx/interpolated_transform.h
index 59a52ed..097c2b1 100644
--- a/ui/gfx/interpolated_transform.h
+++ b/ui/gfx/interpolated_transform.h
@@ -195,7 +195,7 @@
///////////////////////////////////////////////////////////////////////////////
class UI_EXPORT InterpolatedConstantTransform : public InterpolatedTransform {
public:
- InterpolatedConstantTransform(const gfx::Transform& transform);
+ explicit InterpolatedConstantTransform(const gfx::Transform& transform);
virtual ~InterpolatedConstantTransform();
protected:
@@ -263,4 +263,4 @@
} // namespace ui
-#endif // UI_GFX_INTERPOLATED_TRANSFORM_H_
+#endif // UI_GFX_INTERPOLATED_TRANSFORM_H_
diff --git a/ui/gfx/point3.h b/ui/gfx/point3.h
index d6ee8f25..06caa5e 100644
--- a/ui/gfx/point3.h
+++ b/ui/gfx/point3.h
@@ -18,7 +18,7 @@
Point3f(float x, float y, float z) : x_(x), y_(y), z_(z) {}
- Point3f(const Point& point) : x_(point.x()), y_(point.y()), z_(0) {}
+ explicit Point3f(const Point& point) : x_(point.x()), y_(point.y()), z_(0) {}
~Point3f() {}
diff --git a/ui/gfx/point_conversions.h b/ui/gfx/point_conversions.h
index 6fb4ca07..5c43610c 100644
--- a/ui/gfx/point_conversions.h
+++ b/ui/gfx/point_conversions.h
@@ -18,4 +18,4 @@
} // namespace gfx
-#endif // UI_GFX_RECT_CONVERSIONS_H_
+#endif // UI_GFX_POINT_CONVERSIONS_H_
diff --git a/ui/gfx/scoped_cg_context_save_gstate_mac.h b/ui/gfx/scoped_cg_context_save_gstate_mac.h
index dd84a4e..b22782d 100644
--- a/ui/gfx/scoped_cg_context_save_gstate_mac.h
+++ b/ui/gfx/scoped_cg_context_save_gstate_mac.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_GFX_SCOPED_CG_CONTEXT_SAVE_GSTATE_MAC_H
-#define UI_GFX_SCOPED_CG_CONTEXT_SAVE_GSTATE_MAC_H
+#ifndef UI_GFX_SCOPED_CG_CONTEXT_SAVE_GSTATE_MAC_H_
+#define UI_GFX_SCOPED_CG_CONTEXT_SAVE_GSTATE_MAC_H_
#import <QuartzCore/QuartzCore.h>
@@ -27,4 +27,4 @@
} // namespace gfx
-#endif // UI_GFX_SCOPED_CG_CONTEXT_SAVE_GSTATE_MAC_H
+#endif // UI_GFX_SCOPED_CG_CONTEXT_SAVE_GSTATE_MAC_H_
diff --git a/ui/gfx/scoped_sk_region.h b/ui/gfx/scoped_sk_region.h
index b163cc1..077b749 100644
--- a/ui/gfx/scoped_sk_region.h
+++ b/ui/gfx/scoped_sk_region.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_BASE_GFX_SCOPED_REGION_GFX_H_
-#define UI_BASE_GFX_SCOPED_REGION_GFX_H_
+#ifndef UI_GFX_SCOPED_SK_REGION_H_
+#define UI_GFX_SCOPED_SK_REGION_H_
#include "third_party/skia/include/core/SkRegion.h"
@@ -42,4 +42,4 @@
} // namespace gfx
-#endif // UI_BASE_GFX_SCOPED_REGION_GFX_H_
+#endif // UI_GFX_SCOPED_SK_REGION_H_
diff --git a/ui/gfx/size_conversions.h b/ui/gfx/size_conversions.h
index 494f4839..f642c4cc 100644
--- a/ui/gfx/size_conversions.h
+++ b/ui/gfx/size_conversions.h
@@ -21,4 +21,4 @@
} // namespace gfx
-#endif // UI_GFX_RECT_CONVERSIONS_H_
+#endif // UI_GFX_SIZE_CONVERSIONS_H_
diff --git a/ui/gfx/video_decode_acceleration_support_mac.h b/ui/gfx/video_decode_acceleration_support_mac.h
index c681aa3..6d2be5d 100644
--- a/ui/gfx/video_decode_acceleration_support_mac.h
+++ b/ui/gfx/video_decode_acceleration_support_mac.h
@@ -25,8 +25,8 @@
// This Mac OS X-specific class provides dynamically linked access to
// VideoDecodeAcceleration.framework, which is only available on 10.6 and later.
-class UI_EXPORT VideoDecodeAccelerationSupport :
- public base::RefCountedThreadSafe<VideoDecodeAccelerationSupport> {
+class UI_EXPORT VideoDecodeAccelerationSupport
+ : public base::RefCountedThreadSafe<VideoDecodeAccelerationSupport> {
public:
enum Status {
SUCCESS = 0,
