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

Unified Diff: cc/CCDrawQuad.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: 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
« no previous file with comments | « cc/CCDirectRenderer.cpp ('k') | cc/CCDrawQuad.cpp » ('j') | cc/math/clamp.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCDrawQuad.h
diff --git a/cc/CCDrawQuad.h b/cc/CCDrawQuad.h
index 6808f37c1fc485ed296aaee59448fcfbb724e555..c5d56a4b5ba2666bcae36dddf6337a58ca41b12b 100644
--- a/cc/CCDrawQuad.h
+++ b/cc/CCDrawQuad.h
@@ -38,19 +38,19 @@ public:
StreamVideoContent,
};
- IntRect quadRect() const { return m_quadRect; }
+ ccmath::IntRect 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; }
+ ccmath::IntRect visibleContentRect() const { return m_sharedQuadState->visibleContentRect; }
+ ccmath::IntRect 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); }
+ ccmath::IntRect opaqueRect() const;
+ bool needsBlending() const { return m_needsBlending || !opaqueRect().Contains(m_quadVisibleRect); }
// 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 ccmath::IntRect&);
+ ccmath::IntRect 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 ccmath::IntRect&);
// 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;
+ ccmath::IntRect m_quadRect;
+ ccmath::IntRect 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;
+ ccmath::IntRect m_opaqueRect;
};
#pragma pack(pop)
« no previous file with comments | « cc/CCDirectRenderer.cpp ('k') | cc/CCDrawQuad.cpp » ('j') | cc/math/clamp.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698