| Index: cc/stubs/int_rect.h
|
| diff --git a/cc/stubs/int_rect.h b/cc/stubs/int_rect.h
|
| index 1599967a88117225ba67c4b3e964d661b6205053..4114d7ba0c061b6c4a01e8b007c181ee13687cca 100644
|
| --- a/cc/stubs/int_rect.h
|
| +++ b/cc/stubs/int_rect.h
|
| @@ -12,6 +12,11 @@
|
| #else
|
| #include "third_party/WebKit/Source/WebCore/platform/graphics/IntRect.h"
|
| #endif
|
| +#include "ui/gfx/rect.h"
|
| +
|
| +#if defined(OS_MACOSX)
|
| +#include <ApplicationServices/ApplicationServices.h>
|
| +#endif
|
|
|
| namespace cc {
|
|
|
| @@ -34,6 +39,18 @@ public:
|
| {
|
|
|
| }
|
| +
|
| + explicit IntRect(gfx::Rect rect)
|
| + : WebCore::IntRect(rect.x(), rect.y(), rect.width(), rect.height())
|
| + {
|
| + }
|
| +
|
| + operator gfx::Rect() const { return gfx::Rect(x(), y(), width(), height()); }
|
| +
|
| +private:
|
| +#if defined(OS_MACOSX)
|
| + operator CGRect() const;
|
| +#endif
|
| };
|
|
|
| }
|
|
|