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

Unified Diff: cc/render_pass_unittest.cc

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/render_pass_draw_quad.cc ('k') | cc/render_surface_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/render_pass_unittest.cc
diff --git a/cc/render_pass_unittest.cc b/cc/render_pass_unittest.cc
index 6a3a0ec617ba6ddba13c9e7e157b0284f9d4d860..f7a3a75aca03d275ce24685dedc2199a6f04b770 100644
--- a/cc/render_pass_unittest.cc
+++ b/cc/render_pass_unittest.cc
@@ -32,8 +32,8 @@ struct CCRenderPassSize {
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;
@@ -43,12 +43,12 @@ struct CCRenderPassSize {
TEST(CCRenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
{
CCRenderPass::Id id(3, 2);
- IntRect outputRect(45, 22, 120, 13);
+ gfx::Rect outputRect(45, 22, 120, 13);
WebTransformationMatrix transformToRoot(1, 0.5, 0.5, -0.5, -1, 0);
scoped_ptr<CCRenderPass> pass = CCRenderPass::create(id, outputRect, transformToRoot);
- IntRect damageRect(56, 123, 19, 43);
+ gfx::Rect damageRect(56, 123, 19, 43);
bool hasTransparentBackground = true;
bool hasOcclusionFromOutsideTargetSurface = true;
WebFilterOperations filters;
@@ -65,8 +65,8 @@ TEST(CCRenderPassTest, copyShouldBeIdenticalExceptIdAndQuads)
// Stick a quad in the pass, this should not get copied.
CCTestRenderPass* testPass = static_cast<CCTestRenderPass*>(pass.get());
- testPass->sharedQuadStateList().append(CCSharedQuadState::create(WebTransformationMatrix(), IntRect(), IntRect(), 1, false));
- testPass->quadList().append(CCCheckerboardDrawQuad::create(testPass->sharedQuadStateList().last(), IntRect(), SkColor()).PassAs<CCDrawQuad>());
+ testPass->sharedQuadStateList().append(CCSharedQuadState::create(WebTransformationMatrix(), gfx::Rect(), gfx::Rect(), 1, false));
+ testPass->quadList().append(CCCheckerboardDrawQuad::create(testPass->sharedQuadStateList().last(), gfx::Rect(), SkColor()).PassAs<CCDrawQuad>());
CCRenderPass::Id newId(63, 4);
« no previous file with comments | « cc/render_pass_draw_quad.cc ('k') | cc/render_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698