| 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_FLOATPOINT_H_ | 5 #ifndef CC_STUBS_FLOATPOINT_H_ |
| 6 #define CC_STUBS_FLOATPOINT_H_ | 6 #define CC_STUBS_FLOATPOINT_H_ |
| 7 | 7 |
| 8 #include "FloatSize.h" | 8 #include "FloatSize.h" |
| 9 #include "IntPoint.h" | 9 #include "IntPoint.h" |
| 10 #if INSIDE_WEBKIT_BUILD | 10 #if INSIDE_WEBKIT_BUILD |
| 11 #include "Source/WebCore/platform/graphics/FloatPoint.h" | 11 #include "Source/WebCore/platform/graphics/FloatPoint.h" |
| 12 #else | 12 #else |
| 13 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatPoint.h" | 13 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatPoint.h" |
| 14 #endif | 14 #endif |
| 15 #include <public/WebFloatPoint.h> |
| 15 | 16 |
| 16 namespace cc { | 17 namespace cc { |
| 17 | 18 |
| 18 class FloatPoint : public WebCore::FloatPoint { | 19 class FloatPoint : public WebCore::FloatPoint { |
| 19 public: | 20 public: |
| 20 FloatPoint() { } | 21 FloatPoint() { } |
| 21 | 22 |
| 22 FloatPoint(float width, float height) | 23 FloatPoint(float width, float height) |
| 23 : WebCore::FloatPoint(width, height) | 24 : WebCore::FloatPoint(width, height) |
| 24 { | 25 { |
| (...skipping 10 matching lines...) Expand all Loading... |
| 35 } | 36 } |
| 36 | 37 |
| 37 FloatPoint(WebCore::IntPoint point) | 38 FloatPoint(WebCore::IntPoint point) |
| 38 : WebCore::FloatPoint(point) | 39 : WebCore::FloatPoint(point) |
| 39 { | 40 { |
| 40 } | 41 } |
| 41 | 42 |
| 42 FloatPoint(WebCore::FloatPoint point) | 43 FloatPoint(WebCore::FloatPoint point) |
| 43 : WebCore::FloatPoint(point.x(), point.y()) | 44 : WebCore::FloatPoint(point.x(), point.y()) |
| 44 { | 45 { |
| 46 } |
| 45 | 47 |
| 48 FloatPoint(WebKit::WebFloatPoint point) |
| 49 : WebCore::FloatPoint(point.x, point.y) |
| 50 { |
| 51 } |
| 52 |
| 53 operator WebKit::WebFloatPoint() const |
| 54 { |
| 55 return WebKit::WebFloatPoint(x(), y()); |
| 46 } | 56 } |
| 47 }; | 57 }; |
| 48 | 58 |
| 49 } | 59 } |
| 50 | 60 |
| 51 #endif | 61 #endif |
| OLD | NEW |