ui: Remove gfx::Size::ClampToNonNegative, prevent negative sizes always.

This was added with the intention of using Size as a vector, replacing use of
IntSize. Since we have Vector2d now, negative sizes should not exist, so clamp
them in set_width/set_height and the constructor.

R=sky
BUG=160158

Review URL: https://codereview.chromium.org/11365160

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167062 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 8 deletions

diff --git a/ui/gfx/size.cc b/ui/gfx/size.cc
index 6d28ded..26bb973 100644
--- a/ui/gfx/size.cc
+++ b/ui/gfx/size.cc
@@ -8,9 +8,8 @@
 #include <windows.h>
 #endif
 
-#include "base/logging.h"
 #include "base/stringprintf.h"
-#include "ui/gfx/size_base.h"
+#include "ui/gfx/size_base_impl.h"
 
 namespace gfx {
 
@@ -18,15 +17,13 @@ template class SizeBase<Size, int>;
 
 Size::Size() : SizeBase<Size, int>(0, 0) {}
 
-Size::Size(int width, int height) : SizeBase<Size, int>(0, 0) {
-  set_width(width);
-  set_height(height);
+Size::Size(int width, int height)
+    : SizeBase<Size, int>(width, height) {
 }
 
 #if defined(OS_MACOSX)
-Size::Size(const CGSize& s) : SizeBase<Size, int>(0, 0) {
-  set_width(s.width);
-  set_height(s.height);
+Size::Size(const CGSize& s)
+    : SizeBase<Size, int>(s.width, s.height) {
 }
 
 Size& Size::operator=(const CGSize& s) {