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

Unified Diff: cc/tile_draw_quad.h

Issue 10984053: cc: Use ui/gfx geometry types for the CCRenderPass and CCDrawQuad classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 2 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
« no previous file with comments | « cc/texture_draw_quad.cc ('k') | cc/tile_draw_quad.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tile_draw_quad.h
diff --git a/cc/tile_draw_quad.h b/cc/tile_draw_quad.h
index 4802d82959d784b78bd2a3ec8f17b4db06628d3a..08d075fe1a7054e352136747702cf91af1e121cc 100644
--- a/cc/tile_draw_quad.h
+++ b/cc/tile_draw_quad.h
@@ -7,9 +7,9 @@
#include "CCDrawQuad.h"
#include "third_party/khronos/GLES2/gl2.h"
-#include "IntPoint.h"
-#include "IntSize.h"
#include "base/memory/scoped_ptr.h"
+#include "ui/gfx/point.h"
+#include "ui/gfx/size.h"
namespace cc {
@@ -17,11 +17,11 @@ namespace cc {
class CCTileDrawQuad : public CCDrawQuad {
public:
- static scoped_ptr<CCTileDrawQuad> create(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
+ static scoped_ptr<CCTileDrawQuad> create(const CCSharedQuadState*, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, const gfx::Point& textureOffset, const gfx::Size& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
unsigned resourceId() const { return m_resourceId; }
- IntPoint textureOffset() const { return m_textureOffset; }
- IntSize textureSize() const { return m_textureSize; }
+ gfx::Point textureOffset() const { return m_textureOffset; }
+ gfx::Size textureSize() const { return m_textureSize; }
GLint textureFilter() const { return m_textureFilter; }
bool swizzleContents() const { return m_swizzleContents; }
@@ -34,11 +34,11 @@ public:
static const CCTileDrawQuad* materialCast(const CCDrawQuad*);
private:
- CCTileDrawQuad(const CCSharedQuadState*, const IntRect& quadRect, const IntRect& opaqueRect, unsigned resourceId, const IntPoint& textureOffset, const IntSize& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
+ CCTileDrawQuad(const CCSharedQuadState*, const gfx::Rect& quadRect, const gfx::Rect& opaqueRect, unsigned resourceId, const gfx::Point& textureOffset, const gfx::Size& textureSize, GLint textureFilter, bool swizzleContents, bool leftEdgeAA, bool topEdgeAA, bool rightEdgeAA, bool bottomEdgeAA);
unsigned m_resourceId;
- IntPoint m_textureOffset;
- IntSize m_textureSize;
+ gfx::Point m_textureOffset;
+ gfx::Size m_textureSize;
GLint m_textureFilter;
bool m_swizzleContents;
bool m_leftEdgeAA;
« no previous file with comments | « cc/texture_draw_quad.cc ('k') | cc/tile_draw_quad.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698