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_FLOATSIZE_H_ | 5 #ifndef CC_STUBS_FLOATSIZE_H_ |
6 #define CC_STUBS_FLOATSIZE_H_ | 6 #define CC_STUBS_FLOATSIZE_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/FloatSize.h" | 10 #include "Source/WebCore/platform/graphics/FloatSize.h" |
11 #else | 11 #else |
12 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatSize.h" | 12 #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatSize.h" |
13 #endif | 13 #endif |
14 #include "ui/gfx/size_f.h" | 14 #include "ui/gfx/size_f.h" |
| 15 #include "ui/gfx/vector2d_f.h" |
15 | 16 |
16 namespace cc { | 17 namespace cc { |
17 class FloatSize : public WebCore::FloatSize { | 18 class FloatSize : public WebCore::FloatSize { |
18 public: | 19 public: |
19 FloatSize() { } | 20 FloatSize() { } |
20 | 21 |
21 FloatSize(float width, float height) | 22 FloatSize(float width, float height) |
22 : WebCore::FloatSize(width, height) | 23 : WebCore::FloatSize(width, height) |
23 { | 24 { |
24 } | 25 } |
(...skipping 11 matching lines...) Expand all Loading... |
36 FloatSize(WebCore::IntSize size) | 37 FloatSize(WebCore::IntSize size) |
37 : WebCore::FloatSize(size.width(), size.height()) | 38 : WebCore::FloatSize(size.width(), size.height()) |
38 { | 39 { |
39 } | 40 } |
40 | 41 |
41 explicit FloatSize(gfx::SizeF size) | 42 explicit FloatSize(gfx::SizeF size) |
42 : WebCore::FloatSize(size.width(), size.height()) | 43 : WebCore::FloatSize(size.width(), size.height()) |
43 { | 44 { |
44 } | 45 } |
45 | 46 |
| 47 explicit FloatSize(gfx::Vector2dF vector) |
| 48 : WebCore::FloatSize(vector.x(), vector.y()) |
| 49 { |
| 50 } |
| 51 |
46 operator gfx::SizeF() const { return gfx::SizeF(width(), height()); } | 52 operator gfx::SizeF() const { return gfx::SizeF(width(), height()); } |
| 53 |
| 54 operator gfx::Vector2dF() const { return gfx::Vector2dF(width(), height());
} |
47 }; | 55 }; |
48 | 56 |
49 } | 57 } |
50 | 58 |
51 #endif | 59 #endif |
OLD | NEW |