OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 18 matching lines...) Expand all Loading... |
29 */ | 29 */ |
30 | 30 |
31 #ifndef WebSize_h | 31 #ifndef WebSize_h |
32 #define WebSize_h | 32 #define WebSize_h |
33 | 33 |
34 #include "WebCommon.h" | 34 #include "WebCommon.h" |
35 | 35 |
36 #if INSIDE_BLINK | 36 #if INSIDE_BLINK |
37 #include "platform/geometry/IntSize.h" | 37 #include "platform/geometry/IntSize.h" |
38 #else | 38 #else |
| 39 #include <ui/gfx/geometry/size.h> |
| 40 #include <ui/gfx/geometry/vector2d.h> |
39 #include <algorithm> | 41 #include <algorithm> |
40 #include <cmath> | 42 #include <cmath> |
41 #include <ui/gfx/geometry/size.h> | |
42 #include <ui/gfx/geometry/vector2d.h> | |
43 #endif | 43 #endif |
44 | 44 |
45 namespace blink { | 45 namespace blink { |
46 | 46 |
47 struct WebSize { | 47 struct WebSize { |
48 int width; | 48 int width; |
49 int height; | 49 int height; |
50 | 50 |
51 bool isEmpty() const { return width <= 0 || height <= 0; } | 51 bool isEmpty() const { return width <= 0 || height <= 0; } |
52 | 52 |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 return a.width == b.width && a.height == b.height; | 93 return a.width == b.width && a.height == b.height; |
94 } | 94 } |
95 | 95 |
96 inline bool operator!=(const WebSize& a, const WebSize& b) { | 96 inline bool operator!=(const WebSize& a, const WebSize& b) { |
97 return !(a == b); | 97 return !(a == b); |
98 } | 98 } |
99 | 99 |
100 } // namespace blink | 100 } // namespace blink |
101 | 101 |
102 #endif | 102 #endif |
OLD | NEW |