Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2840)

Unified Diff: cc/CCRenderPassDrawQuad.h

Issue 10989028: cc: Remove WebCore dependecies from CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/CCRenderPassDrawQuad.h
diff --git a/cc/CCRenderPassDrawQuad.h b/cc/CCRenderPassDrawQuad.h
index 67088925d7edcc1d8a3d178ffab7cf03efc71bc7..0c69e6efc82b0d84369e4295d7bda9ee3070ee7f 100644
--- a/cc/CCRenderPassDrawQuad.h
+++ b/cc/CCRenderPassDrawQuad.h
@@ -8,7 +8,6 @@
#include "CCDrawQuad.h"
#include "CCRenderPass.h"
#include "CCResourceProvider.h"
-#include "IntRect.h"
#include "base/memory/scoped_ptr.h"
namespace cc {
@@ -16,12 +15,12 @@ namespace cc {
class CCRenderPassDrawQuad : public CCDrawQuad {
WTF_MAKE_NONCOPYABLE(CCRenderPassDrawQuad);
public:
- static scoped_ptr<CCRenderPassDrawQuad> create(const CCSharedQuadState*, const IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
+ static scoped_ptr<CCRenderPassDrawQuad> create(const CCSharedQuadState*, const WebKit::WebRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const WebKit::WebRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
CCRenderPass::Id renderPassId() const { return m_renderPassId; }
bool isReplica() const { return m_isReplica; }
CCResourceProvider::ResourceId maskResourceId() const { return m_maskResourceId; }
- const IntRect& contentsChangedSinceLastFrame() const { return m_contentsChangedSinceLastFrame; }
+ const WebKit::WebRect& contentsChangedSinceLastFrame() const { return m_contentsChangedSinceLastFrame; }
static const CCRenderPassDrawQuad* materialCast(const CCDrawQuad*);
float maskTexCoordScaleX() const { return m_maskTexCoordScaleX; }
@@ -32,12 +31,12 @@ public:
scoped_ptr<CCRenderPassDrawQuad> copy(const CCSharedQuadState* copiedSharedQuadState, CCRenderPass::Id copiedRenderPassId) const;
private:
- CCRenderPassDrawQuad(const CCSharedQuadState*, const IntRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const IntRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
+ CCRenderPassDrawQuad(const CCSharedQuadState*, const WebKit::WebRect&, CCRenderPass::Id renderPassId, bool isReplica, CCResourceProvider::ResourceId maskResourceId, const WebKit::WebRect& contentsChangedSinceLastFrame, float maskTexCoordScaleX, float maskTexCoordScaleY, float maskTexCoordOffsetX, float maskTexCoordOffsetY);
CCRenderPass::Id m_renderPassId;
bool m_isReplica;
CCResourceProvider::ResourceId m_maskResourceId;
- IntRect m_contentsChangedSinceLastFrame;
+ WebKit::WebRect m_contentsChangedSinceLastFrame;
float m_maskTexCoordScaleX;
float m_maskTexCoordScaleY;
float m_maskTexCoordOffsetX;
« no previous file with comments | « cc/CCRenderPass.cpp ('k') | cc/CCRenderPassDrawQuad.cpp » ('j') | cc/scoped_ptr_hash_map.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698