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

Unified Diff: cc/CCRenderPass.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/CCQuadCullerTest.cpp ('k') | cc/CCRenderPass.cpp » ('j') | cc/math/clamp.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCRenderPass.h
diff --git a/cc/CCRenderPass.h b/cc/CCRenderPass.h
index d4c518aca37aa7597e56098b538a82fd0da0ed64..9683503fc0cfcf4a91990a2ec01afbfde524a039 100644
--- a/cc/CCRenderPass.h
+++ b/cc/CCRenderPass.h
@@ -8,8 +8,8 @@
#include "CCDrawQuad.h"
#include "CCOcclusionTracker.h"
#include "CCSharedQuadState.h"
-#include "FloatRect.h"
#include "SkColor.h"
+#include "cc/math/float_rect.h"
#include "cc/own_ptr_vector.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
@@ -58,7 +58,7 @@ public:
bool operator<(const Id& other) const { return layerId < other.layerId || (layerId == other.layerId && index < other.index); }
};
- static PassOwnPtr<CCRenderPass> create(Id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
+ static PassOwnPtr<CCRenderPass> create(Id, ccmath::IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
// A shallow copy of the render pass, which does not include its quads.
PassOwnPtr<CCRenderPass> copy(Id newId) const;
@@ -76,10 +76,10 @@ public:
const WebKit::WebTransformationMatrix& transformToRootTarget() const { return m_transformToRootTarget; }
// This denotes the bounds in physical pixels of the output generated by this RenderPass.
- const IntRect& outputRect() const { return m_outputRect; }
+ const ccmath::IntRect& outputRect() const { return m_outputRect; }
- FloatRect damageRect() const { return m_damageRect; }
- void setDamageRect(FloatRect rect) { m_damageRect = rect; }
+ ccmath::FloatRect damageRect() const { return m_damageRect; }
+ void setDamageRect(ccmath::FloatRect rect) { m_damageRect = rect; }
const WebKit::WebFilterOperations& filters() const { return m_filters; }
void setFilters(const WebKit::WebFilterOperations& filters) { m_filters = filters; }
@@ -93,14 +93,14 @@ public:
bool hasOcclusionFromOutsideTargetSurface() const { return m_hasOcclusionFromOutsideTargetSurface; }
void setHasOcclusionFromOutsideTargetSurface(bool hasOcclusionFromOutsideTargetSurface) { m_hasOcclusionFromOutsideTargetSurface = hasOcclusionFromOutsideTargetSurface; }
protected:
- CCRenderPass(Id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
+ CCRenderPass(Id, ccmath::IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
Id m_id;
CCQuadList m_quadList;
CCSharedQuadStateList m_sharedQuadStateList;
WebKit::WebTransformationMatrix m_transformToRootTarget;
- IntRect m_outputRect;
- FloatRect m_damageRect;
+ ccmath::IntRect m_outputRect;
+ ccmath::FloatRect m_damageRect;
bool m_hasTransparentBackground;
bool m_hasOcclusionFromOutsideTargetSurface;
WebKit::WebFilterOperations m_filters;
« no previous file with comments | « cc/CCQuadCullerTest.cpp ('k') | cc/CCRenderPass.cpp » ('j') | cc/math/clamp.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698