| 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 15 matching lines...) Expand all Loading... |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #ifndef WebPoint_h | 31 #ifndef WebPoint_h |
| 32 #define WebPoint_h | 32 #define WebPoint_h |
| 33 | 33 |
| 34 #include "WebCommon.h" | 34 #include "WebCommon.h" |
| 35 | 35 |
| 36 #if WEBKIT_IMPLEMENTATION | 36 #if INSIDE_WEBKIT |
| 37 #include "core/platform/graphics/IntPoint.h" | 37 #include "core/platform/graphics/IntPoint.h" |
| 38 #else | 38 #else |
| 39 #include <ui/gfx/point.h> | 39 #include <ui/gfx/point.h> |
| 40 #endif | 40 #endif |
| 41 | 41 |
| 42 namespace WebKit { | 42 namespace WebKit { |
| 43 | 43 |
| 44 struct WebPoint { | 44 struct WebPoint { |
| 45 int x; | 45 int x; |
| 46 int y; | 46 int y; |
| 47 | 47 |
| 48 WebPoint() | 48 WebPoint() |
| 49 : x(0) | 49 : x(0) |
| 50 , y(0) | 50 , y(0) |
| 51 { | 51 { |
| 52 } | 52 } |
| 53 | 53 |
| 54 WebPoint(int x, int y) | 54 WebPoint(int x, int y) |
| 55 : x(x) | 55 : x(x) |
| 56 , y(y) | 56 , y(y) |
| 57 { | 57 { |
| 58 } | 58 } |
| 59 | 59 |
| 60 #if WEBKIT_IMPLEMENTATION | 60 #if INSIDE_WEBKIT |
| 61 WebPoint(const WebCore::IntPoint& p) | 61 WebPoint(const WebCore::IntPoint& p) |
| 62 : x(p.x()) | 62 : x(p.x()) |
| 63 , y(p.y()) | 63 , y(p.y()) |
| 64 { | 64 { |
| 65 } | 65 } |
| 66 | 66 |
| 67 WebPoint& operator=(const WebCore::IntPoint& p) | 67 WebPoint& operator=(const WebCore::IntPoint& p) |
| 68 { | 68 { |
| 69 x = p.x(); | 69 x = p.x(); |
| 70 y = p.y(); | 70 y = p.y(); |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 } | 102 } |
| 103 | 103 |
| 104 inline bool operator!=(const WebPoint& a, const WebPoint& b) | 104 inline bool operator!=(const WebPoint& a, const WebPoint& b) |
| 105 { | 105 { |
| 106 return !(a == b); | 106 return !(a == b); |
| 107 } | 107 } |
| 108 | 108 |
| 109 } // namespace WebKit | 109 } // namespace WebKit |
| 110 | 110 |
| 111 #endif | 111 #endif |
| OLD | NEW |