OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/gfx/size_base.h" | 5 #include "ui/gfx/size_base.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 | 8 |
9 // This file provides the implementation for SizeBase template and | 9 // This file provides the implementation for SizeBase template and |
10 // used to instantiate the base class for Size and SizeF classes. | 10 // used to instantiate the base class for Size and SizeF classes. |
11 #if !defined(UI_IMPLEMENTATION) | 11 #if !defined(UI_IMPLEMENTATION) |
12 #error "This file is intended for UI implementation only" | 12 #error "This file is intended for UI implementation only" |
13 #endif | 13 #endif |
14 | 14 |
15 namespace gfx { | 15 namespace gfx { |
16 | 16 |
17 template<typename Class, typename Type> | 17 template<typename Class, typename Type> |
18 void SizeBase<Class, Type>::set_width(Type width) { | 18 void SizeBase<Class, Type>::set_width(Type width) { |
| 19 #if !defined(OS_ANDROID) |
| 20 // TODO(aelias): Remove these ifdefs for Android. See http://crbug.com/168927 |
19 DCHECK(!(width < 0)); | 21 DCHECK(!(width < 0)); |
| 22 #endif |
20 width_ = width < 0 ? 0 : width; | 23 width_ = width < 0 ? 0 : width; |
21 } | 24 } |
22 | 25 |
23 template<typename Class, typename Type> | 26 template<typename Class, typename Type> |
24 void SizeBase<Class, Type>::set_height(Type height) { | 27 void SizeBase<Class, Type>::set_height(Type height) { |
| 28 #if !defined(OS_ANDROID) |
25 DCHECK(!(height < 0)); | 29 DCHECK(!(height < 0)); |
| 30 #endif |
26 height_ = height < 0 ? 0 : height; | 31 height_ = height < 0 ? 0 : height; |
27 } | 32 } |
28 | 33 |
29 template<typename Class, typename Type> | 34 template<typename Class, typename Type> |
30 SizeBase<Class, Type>::SizeBase(Type width, Type height) | 35 SizeBase<Class, Type>::SizeBase(Type width, Type height) |
31 : width_(width < 0 ? 0 : width), | 36 : width_(width < 0 ? 0 : width), |
32 height_(height < 0 ? 0 : height) { | 37 height_(height < 0 ? 0 : height) { |
| 38 #if !defined(OS_ANDROID) |
33 DCHECK(!(width < 0)); | 39 DCHECK(!(width < 0)); |
34 DCHECK(!(height < 0)); | 40 DCHECK(!(height < 0)); |
| 41 #endif |
35 } | 42 } |
36 | 43 |
37 } // namespace gfx | 44 } // namespace gfx |
OLD | NEW |