| 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 | 15 |
| 15 namespace cc { | 16 namespace cc { |
| 16 class FloatSize : public WebCore::FloatSize { | 17 class FloatSize : public WebCore::FloatSize { |
| 17 public: | 18 public: |
| 18 FloatSize() { } | 19 FloatSize() { } |
| 19 | 20 |
| 20 FloatSize(float width, float height) | 21 FloatSize(float width, float height) |
| 21 : WebCore::FloatSize(width, height) | 22 : WebCore::FloatSize(width, height) |
| 22 { | 23 { |
| 23 } | 24 } |
| 24 | 25 |
| 25 FloatSize(IntSize size) | 26 FloatSize(IntSize size) |
| 26 : WebCore::FloatSize(size.width(), size.height()) | 27 : WebCore::FloatSize(size.width(), size.height()) |
| 27 { | 28 { |
| 28 } | 29 } |
| 29 | 30 |
| 30 FloatSize(WebCore::FloatSize size) | 31 FloatSize(WebCore::FloatSize size) |
| 31 : WebCore::FloatSize(size.width(), size.height()) | 32 : WebCore::FloatSize(size.width(), size.height()) |
| 32 { | 33 { |
| 33 } | 34 } |
| 34 | 35 |
| 35 FloatSize(WebCore::IntSize size) | 36 FloatSize(WebCore::IntSize size) |
| 36 : WebCore::FloatSize(size.width(), size.height()) | 37 : WebCore::FloatSize(size.width(), size.height()) |
| 37 { | 38 { |
| 38 } | 39 } |
| 40 |
| 41 operator gfx::SizeF() const { return gfx::SizeF(width(), height()); } |
| 39 }; | 42 }; |
| 40 | 43 |
| 41 } | 44 } |
| 42 | 45 |
| 43 #endif | 46 #endif |
| OLD | NEW |