Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: ui/gfx/size.cc

Issue 11275243: Revert 167062 - ui: Remove gfx::Size::ClampToNonNegative, prevent negative sizes always. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/rect_unittest.cc ('k') | ui/gfx/size_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/size.cc
===================================================================
--- ui/gfx/size.cc (revision 167065)
+++ ui/gfx/size.cc (working copy)
@@ -8,8 +8,9 @@
#include <windows.h>
#endif
+#include "base/logging.h"
#include "base/stringprintf.h"
-#include "ui/gfx/size_base_impl.h"
+#include "ui/gfx/size_base.h"
namespace gfx {
@@ -17,13 +18,15 @@
Size::Size() : SizeBase<Size, int>(0, 0) {}
-Size::Size(int width, int height)
- : SizeBase<Size, int>(width, height) {
+Size::Size(int width, int height) : SizeBase<Size, int>(0, 0) {
+ set_width(width);
+ set_height(height);
}
#if defined(OS_MACOSX)
-Size::Size(const CGSize& s)
- : SizeBase<Size, int>(s.width, s.height) {
+Size::Size(const CGSize& s) : SizeBase<Size, int>(0, 0) {
+ set_width(s.width);
+ set_height(s.height);
}
Size& Size::operator=(const CGSize& s) {
« no previous file with comments | « ui/gfx/rect_unittest.cc ('k') | ui/gfx/size_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698