| Index: cc/stubs/float_rect.h
|
| diff --git a/cc/stubs/float_rect.h b/cc/stubs/float_rect.h
|
| index 2eb03e2749e738ef9c94b80f3c89dcf882a3c419..e4a37097b9422cd7c291b75ebdf0d5d458576741 100644
|
| --- a/cc/stubs/float_rect.h
|
| +++ b/cc/stubs/float_rect.h
|
| @@ -13,6 +13,11 @@
|
| #else
|
| #include "third_party/WebKit/Source/WebCore/platform/graphics/FloatRect.h"
|
| #endif
|
| +#include "ui/gfx/rect_f.h"
|
| +
|
| +#if defined(OS_MACOSX)
|
| +#include <ApplicationServices/ApplicationServices.h>
|
| +#endif
|
|
|
| namespace cc {
|
|
|
| @@ -49,6 +54,18 @@ public:
|
| :WebCore::FloatRect(rect)
|
| {
|
| }
|
| +
|
| + explicit FloatRect(gfx::RectF rect)
|
| + : WebCore::FloatRect(rect.x(), rect.y(), rect.width(), rect.height())
|
| + {
|
| + }
|
| +
|
| + operator gfx::RectF() const { return gfx::RectF(x(), y(), width(), height()); }
|
| +
|
| +private:
|
| +#if defined(OS_MACOSX)
|
| + operator CGRect() const;
|
| +#endif
|
| };
|
|
|
| }
|
|
|