| Index: cc/CCDrawQuad.h
|
| diff --git a/cc/CCDrawQuad.h b/cc/CCDrawQuad.h
|
| index 05a69065468192a161ea93de87601fab0119a7cd..acd18f1588becf0f3653a09065e2e9689e9b8e14 100644
|
| --- a/cc/CCDrawQuad.h
|
| +++ b/cc/CCDrawQuad.h
|
| @@ -38,19 +38,19 @@ public:
|
| StreamVideoContent,
|
| };
|
|
|
| - IntRect quadRect() const { return m_quadRect; }
|
| + WebKit::WebRect quadRect() const { return m_quadRect; }
|
| const WebKit::WebTransformationMatrix& quadTransform() const { return m_sharedQuadState->quadTransform; }
|
| - IntRect visibleContentRect() const { return m_sharedQuadState->visibleContentRect; }
|
| - IntRect clippedRectInTarget() const { return m_sharedQuadState->clippedRectInTarget; }
|
| + WebKit::WebRect visibleContentRect() const { return m_sharedQuadState->visibleContentRect; }
|
| + WebKit::WebRect clippedRectInTarget() const { return m_sharedQuadState->clippedRectInTarget; }
|
| float opacity() const { return m_sharedQuadState->opacity; }
|
| // For the purposes of blending, what part of the contents of this quad are opaque?
|
| - IntRect opaqueRect() const;
|
| - bool needsBlending() const { return m_needsBlending || !opaqueRect().contains(m_quadVisibleRect); }
|
| + WebKit::WebRect opaqueRect() const;
|
| + bool needsBlending() const;
|
|
|
| // Allows changing the rect that gets drawn to make it smaller. Parameter passed
|
| // in will be clipped to quadRect().
|
| - void setQuadVisibleRect(const IntRect&);
|
| - IntRect quadVisibleRect() const { return m_quadVisibleRect; }
|
| + void setQuadVisibleRect(const WebKit::WebRect&);
|
| + WebKit::WebRect quadVisibleRect() const { return m_quadVisibleRect; }
|
| bool isDebugQuad() const { return m_material == DebugBorder; }
|
|
|
| Material material() const { return m_material; }
|
| @@ -66,7 +66,7 @@ public:
|
| void setSharedQuadState(const CCSharedQuadState*);
|
|
|
| protected:
|
| - CCDrawQuad(const CCSharedQuadState*, Material, const IntRect&);
|
| + CCDrawQuad(const CCSharedQuadState*, Material, const WebKit::WebRect&);
|
|
|
| // Stores state common to a large bundle of quads; kept separate for memory
|
| // efficiency. There is special treatment to reconstruct these pointers
|
| @@ -75,8 +75,8 @@ protected:
|
| int m_sharedQuadStateId;
|
|
|
| Material m_material;
|
| - IntRect m_quadRect;
|
| - IntRect m_quadVisibleRect;
|
| + WebKit::WebRect m_quadRect;
|
| + WebKit::WebRect m_quadVisibleRect;
|
|
|
| // By default, the shared quad state determines whether or not this quad is
|
| // opaque or needs blending. Derived classes can override with these
|
| @@ -86,7 +86,7 @@ protected:
|
|
|
| // Be default, this rect is empty. It is used when the shared quad state and above
|
| // variables determine that the quad is not fully opaque but may be partially opaque.
|
| - IntRect m_opaqueRect;
|
| + WebKit::WebRect m_opaqueRect;
|
| };
|
|
|
| #pragma pack(pop)
|
|
|