| Index: cc/render_pass.h
|
| diff --git a/cc/render_pass.h b/cc/render_pass.h
|
| index 526d7153a02875cee39c0f4bba691cfa06a5f591..5289c2bc64dddb3f37e747f76fcc70164fedcba1 100644
|
| --- a/cc/render_pass.h
|
| +++ b/cc/render_pass.h
|
| @@ -13,6 +13,7 @@
|
| #include "cc/scoped_ptr_vector.h"
|
| #include "cc/shared_quad_state.h"
|
| #include "third_party/skia/include/core/SkColor.h"
|
| +#include "ui/gfx/rect_f.h"
|
| #include <public/WebFilterOperations.h>
|
| #include <public/WebTransformationMatrix.h>
|
| #include <vector>
|
| @@ -61,7 +62,7 @@ public:
|
| bool operator<(const Id& other) const { return layerId < other.layerId || (layerId == other.layerId && index < other.index); }
|
| };
|
|
|
| - static scoped_ptr<CCRenderPass> create(Id, IntRect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
|
| + static scoped_ptr<CCRenderPass> create(Id, gfx::Rect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
|
|
|
| // A shallow copy of the render pass, which does not include its quads.
|
| scoped_ptr<CCRenderPass> copy(Id newId) const;
|
| @@ -79,10 +80,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 gfx::Rect& outputRect() const { return m_outputRect; }
|
|
|
| - FloatRect damageRect() const { return m_damageRect; }
|
| - void setDamageRect(FloatRect rect) { m_damageRect = rect; }
|
| + gfx::RectF damageRect() const { return m_damageRect; }
|
| + void setDamageRect(gfx::RectF rect) { m_damageRect = rect; }
|
|
|
| const WebKit::WebFilterOperations& filters() const { return m_filters; }
|
| void setFilters(const WebKit::WebFilterOperations& filters) { m_filters = filters; }
|
| @@ -96,14 +97,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, gfx::Rect outputRect, const WebKit::WebTransformationMatrix& transformToRootTarget);
|
|
|
| Id m_id;
|
| CCQuadList m_quadList;
|
| CCSharedQuadStateList m_sharedQuadStateList;
|
| WebKit::WebTransformationMatrix m_transformToRootTarget;
|
| - IntRect m_outputRect;
|
| - FloatRect m_damageRect;
|
| + gfx::Rect m_outputRect;
|
| + gfx::RectF m_damageRect;
|
| bool m_hasTransparentBackground;
|
| bool m_hasOcclusionFromOutsideTargetSurface;
|
| WebKit::WebFilterOperations m_filters;
|
|
|