summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ui/gfx/point.h2
-rw-r--r--ui/gfx/point_base.h4
-rw-r--r--ui/gfx/point_f.h2
-rw-r--r--ui/gfx/rect.h2
-rw-r--r--ui/gfx/rect_base.h4
-rw-r--r--ui/gfx/rect_f.h2
-rw-r--r--ui/gfx/size.h2
-rw-r--r--ui/gfx/size_base.h4
-rw-r--r--ui/gfx/size_f.h2
9 files changed, 15 insertions, 9 deletions
diff --git a/ui/gfx/point.h b/ui/gfx/point.h
index 27bf098..156cba2 100644
--- a/ui/gfx/point.h
+++ b/ui/gfx/point.h
@@ -34,7 +34,7 @@ class UI_EXPORT Point : public PointBase<Point, int> {
explicit Point(const CGPoint& point);
#endif
- virtual ~Point() {}
+ ~Point() {}
#if defined(OS_WIN)
POINT ToPOINT() const;
diff --git a/ui/gfx/point_base.h b/ui/gfx/point_base.h
index 1568c52..32735b9 100644
--- a/ui/gfx/point_base.h
+++ b/ui/gfx/point_base.h
@@ -80,7 +80,9 @@ class UI_EXPORT PointBase {
protected:
PointBase(Type x, Type y) : x_(x), y_(y) {}
- virtual ~PointBase() {}
+ // Destructor is intentionally made non virtual and protected.
+ // Do not make this public.
+ ~PointBase() {}
private:
Type x_;
diff --git a/ui/gfx/point_f.h b/ui/gfx/point_f.h
index 5d29c48..a1fc4c9 100644
--- a/ui/gfx/point_f.h
+++ b/ui/gfx/point_f.h
@@ -24,7 +24,7 @@ class UI_EXPORT PointF : public PointBase<PointF, float> {
PointF();
PointF(float x, float y);
explicit PointF(Point& point);
- virtual ~PointF() {}
+ ~PointF() {}
Point ToPoint() const;
diff --git a/ui/gfx/rect.h b/ui/gfx/rect.h
index 804754b..d1ffb70 100644
--- a/ui/gfx/rect.h
+++ b/ui/gfx/rect.h
@@ -44,7 +44,7 @@ class UI_EXPORT Rect : public RectBase<Rect, Point, Size, Insets, int> {
explicit Rect(const gfx::Size& size);
Rect(const gfx::Point& origin, const gfx::Size& size);
- virtual ~Rect();
+ ~Rect();
#if defined(OS_WIN)
Rect& operator=(const RECT& r);
diff --git a/ui/gfx/rect_base.h b/ui/gfx/rect_base.h
index 3ccd28d..3a273fe2 100644
--- a/ui/gfx/rect_base.h
+++ b/ui/gfx/rect_base.h
@@ -140,7 +140,9 @@ class UI_EXPORT RectBase {
RectBase(const PointClass& origin, const SizeClass& size);
explicit RectBase(const SizeClass& size);
explicit RectBase(const PointClass& origin);
- virtual ~RectBase();
+ // Destructor is intentionally made non virtual and protected.
+ // Do not make this public.
+ ~RectBase();
private:
PointClass origin_;
diff --git a/ui/gfx/rect_f.h b/ui/gfx/rect_f.h
index bb6e814..1c92153 100644
--- a/ui/gfx/rect_f.h
+++ b/ui/gfx/rect_f.h
@@ -30,7 +30,7 @@ class UI_EXPORT RectF : public RectBase<RectF, PointF, SizeF, InsetsF, float> {
explicit RectF(const gfx::SizeF& size);
RectF(const gfx::PointF& origin, const gfx::SizeF& size);
- virtual ~RectF();
+ ~RectF();
Rect ToRect() const;
diff --git a/ui/gfx/size.h b/ui/gfx/size.h
index 670e67e..56d5611 100644
--- a/ui/gfx/size.h
+++ b/ui/gfx/size.h
@@ -29,7 +29,7 @@ class UI_EXPORT Size : public SizeBase<Size, int> {
explicit Size(const CGSize& s);
#endif
- virtual ~Size();
+ ~Size();
#if defined(OS_MACOSX)
Size& operator=(const CGSize& s);
diff --git a/ui/gfx/size_base.h b/ui/gfx/size_base.h
index 590989e..a4e4944 100644
--- a/ui/gfx/size_base.h
+++ b/ui/gfx/size_base.h
@@ -59,7 +59,9 @@ class UI_EXPORT SizeBase {
protected:
SizeBase(Type width, Type height);
- virtual ~SizeBase();
+ // Destructor is intentionally made non virtual and protected.
+ // Do not make this public.
+ ~SizeBase();
private:
Type width_;
diff --git a/ui/gfx/size_f.h b/ui/gfx/size_f.h
index 733e368..1e49660 100644
--- a/ui/gfx/size_f.h
+++ b/ui/gfx/size_f.h
@@ -23,7 +23,7 @@ class UI_EXPORT SizeF : public SizeBase<SizeF, float> {
public:
SizeF();
SizeF(float width, float height);
- virtual ~SizeF();
+ ~SizeF();
Size ToSize() const;