| Index: cc/CCSharedQuadState.h
|
| diff --git a/cc/CCSharedQuadState.h b/cc/CCSharedQuadState.h
|
| index 0f5e386410d599588d644bbf42f78912e8d1bef3..62e76cfe40c1f2bbeb091895bff14a30de52d833 100644
|
| --- a/cc/CCSharedQuadState.h
|
| +++ b/cc/CCSharedQuadState.h
|
| @@ -5,8 +5,8 @@
|
| #ifndef CCSharedQuadState_h
|
| #define CCSharedQuadState_h
|
|
|
| -#include "IntRect.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include <public/WebRect.h>
|
| #include <public/WebTransformationMatrix.h>
|
|
|
| namespace cc {
|
| @@ -17,13 +17,13 @@ struct CCSharedQuadState {
|
| // Transforms from quad's original content space to its target content space.
|
| WebKit::WebTransformationMatrix quadTransform;
|
| // This rect lives in the content space for the quad's originating layer.
|
| - IntRect visibleContentRect;
|
| - IntRect clippedRectInTarget;
|
| + WebKit::WebRect visibleContentRect;
|
| + WebKit::WebRect clippedRectInTarget;
|
| float opacity;
|
| bool opaque;
|
|
|
| - static scoped_ptr<CCSharedQuadState> create(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
|
| - CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const IntRect& visibleContentRect, const IntRect& clippedRectInTarget, float opacity, bool opaque);
|
| + static scoped_ptr<CCSharedQuadState> create(const WebKit::WebTransformationMatrix& quadTransform, const WebKit::WebRect& visibleContentRect, const WebKit::WebRect& clippedRectInTarget, float opacity, bool opaque);
|
| + CCSharedQuadState(const WebKit::WebTransformationMatrix& quadTransform, const WebKit::WebRect& visibleContentRect, const WebKit::WebRect& clippedRectInTarget, float opacity, bool opaque);
|
|
|
| scoped_ptr<CCSharedQuadState> copy() const;
|
| };
|
|
|