| 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 #ifndef CC_STUBS_INTPOINT_H_ | 5 #ifndef CC_STUBS_INTPOINT_H_ |
| 6 #define CC_STUBS_INTPOINT_H_ | 6 #define CC_STUBS_INTPOINT_H_ |
| 7 | 7 |
| 8 #include "IntSize.h" | 8 #include "IntSize.h" |
| 9 #if INSIDE_WEBKIT_BUILD | 9 #if INSIDE_WEBKIT_BUILD |
| 10 #include "Source/WebCore/platform/graphics/IntPoint.h" | 10 #include "Source/WebCore/platform/graphics/IntPoint.h" |
| 11 #else | 11 #else |
| 12 #include "third_party/WebKit/Source/WebCore/platform/graphics/IntPoint.h" | 12 #include "third_party/WebKit/Source/WebCore/platform/graphics/IntPoint.h" |
| 13 #endif | 13 #endif |
| 14 #include <public/WebPoint.h> |
| 14 | 15 |
| 15 namespace cc { | 16 namespace cc { |
| 16 | 17 |
| 17 class IntPoint : public WebCore::IntPoint { | 18 class IntPoint : public WebCore::IntPoint { |
| 18 public: | 19 public: |
| 19 IntPoint() { } | 20 IntPoint() { } |
| 20 | 21 |
| 21 IntPoint(int width, int height) | 22 IntPoint(int width, int height) |
| 22 : WebCore::IntPoint(width, height) | 23 : WebCore::IntPoint(width, height) |
| 23 { | 24 { |
| 24 } | 25 } |
| 25 | 26 |
| 26 IntPoint(IntSize size) | 27 IntPoint(IntSize size) |
| 27 : WebCore::IntPoint(size.width(), size.height()) | 28 : WebCore::IntPoint(size.width(), size.height()) |
| 28 { | 29 { |
| 29 } | 30 } |
| 30 | 31 |
| 31 IntPoint(WebCore::IntPoint point) | 32 IntPoint(WebCore::IntPoint point) |
| 32 : WebCore::IntPoint(point.x(), point.y()) | 33 : WebCore::IntPoint(point.x(), point.y()) |
| 33 { | 34 { |
| 35 } |
| 34 | 36 |
| 37 IntPoint(WebKit::WebPoint point) |
| 38 : WebCore::IntPoint(point.x, point.y) |
| 39 { |
| 40 } |
| 41 |
| 42 operator WebKit::WebPoint() const |
| 43 { |
| 44 return WebKit::WebPoint(x(), y()); |
| 35 } | 45 } |
| 36 }; | 46 }; |
| 37 | 47 |
| 38 } | 48 } |
| 39 | 49 |
| 40 #endif | 50 #endif |
| OLD | NEW |