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

Unified Diff: cc/render_surface_unittest.cc

Issue 12774006: cc: Chromify Layer and LayerImpl classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MoreAndroidCompilings Created 7 years, 9 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_surface_impl.cc ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/render_surface_unittest.cc
diff --git a/cc/render_surface_unittest.cc b/cc/render_surface_unittest.cc
index 256284b6701cce18063849c73b1fc9b499b290d2..dbd169fa6341440c40b806abf0733c0be7ce5525 100644
--- a/cc/render_surface_unittest.cc
+++ b/cc/render_surface_unittest.cc
@@ -39,27 +39,27 @@ TEST(RenderSurfaceTest, verifySurfaceChangesAreTrackedProperly)
FakeImplProxy proxy;
FakeLayerTreeHostImpl hostImpl(&proxy);
- scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(hostImpl.activeTree(), 1);
- owningLayer->createRenderSurface();
- ASSERT_TRUE(owningLayer->renderSurface());
- RenderSurfaceImpl* renderSurface = owningLayer->renderSurface();
+ scoped_ptr<LayerImpl> owningLayer = LayerImpl::Create(hostImpl.activeTree(), 1);
+ owningLayer->CreateRenderSurface();
+ ASSERT_TRUE(owningLayer->render_surface());
+ RenderSurfaceImpl* renderSurface = owningLayer->render_surface();
gfx::Rect testRect = gfx::Rect(gfx::Point(3, 4), gfx::Size(5, 6));
- owningLayer->resetAllChangeTrackingForSubtree();
+ owningLayer->ResetAllChangeTrackingForSubtree();
// Currently, the contentRect, clipRect, and owningLayer->layerPropertyChanged() are
// the only sources of change.
EXECUTE_AND_VERIFY_SURFACE_CHANGED(renderSurface->SetClipRect(testRect));
EXECUTE_AND_VERIFY_SURFACE_CHANGED(renderSurface->SetContentRect(testRect));
- owningLayer->setOpacity(0.5f);
+ owningLayer->SetOpacity(0.5f);
EXPECT_TRUE(renderSurface->SurfacePropertyChanged());
- owningLayer->resetAllChangeTrackingForSubtree();
+ owningLayer->ResetAllChangeTrackingForSubtree();
// Setting the surface properties to the same values again should not be considered "change".
EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->SetClipRect(testRect));
EXECUTE_AND_VERIFY_SURFACE_DID_NOT_CHANGE(renderSurface->SetContentRect(testRect));
- scoped_ptr<LayerImpl> dummyMask = LayerImpl::create(hostImpl.activeTree(), 2);
+ scoped_ptr<LayerImpl> dummyMask = LayerImpl::Create(hostImpl.activeTree(), 2);
gfx::Transform dummyMatrix;
dummyMatrix.Translate(1.0, 2.0);
@@ -75,15 +75,15 @@ TEST(RenderSurfaceTest, sanityCheckSurfaceCreatesCorrectSharedQuadState)
{
FakeImplProxy proxy;
FakeLayerTreeHostImpl hostImpl(&proxy);
- scoped_ptr<LayerImpl> rootLayer = LayerImpl::create(hostImpl.activeTree(), 1);
+ scoped_ptr<LayerImpl> rootLayer = LayerImpl::Create(hostImpl.activeTree(), 1);
- scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(hostImpl.activeTree(), 2);
- owningLayer->createRenderSurface();
- ASSERT_TRUE(owningLayer->renderSurface());
- owningLayer->drawProperties().render_target = owningLayer.get();
- RenderSurfaceImpl* renderSurface = owningLayer->renderSurface();
+ scoped_ptr<LayerImpl> owningLayer = LayerImpl::Create(hostImpl.activeTree(), 2);
+ owningLayer->CreateRenderSurface();
+ ASSERT_TRUE(owningLayer->render_surface());
+ owningLayer->draw_properties().render_target = owningLayer.get();
+ RenderSurfaceImpl* renderSurface = owningLayer->render_surface();
- rootLayer->addChild(owningLayer.Pass());
+ rootLayer->AddChild(owningLayer.Pass());
gfx::Rect contentRect = gfx::Rect(gfx::Point(), gfx::Size(50, 50));
gfx::Rect clipRect = gfx::Rect(gfx::Point(5, 5), gfx::Size(40, 40));
@@ -127,15 +127,15 @@ TEST(RenderSurfaceTest, sanityCheckSurfaceCreatesCorrectRenderPass)
{
FakeImplProxy proxy;
FakeLayerTreeHostImpl hostImpl(&proxy);
- scoped_ptr<LayerImpl> rootLayer = LayerImpl::create(hostImpl.activeTree(), 1);
+ scoped_ptr<LayerImpl> rootLayer = LayerImpl::Create(hostImpl.activeTree(), 1);
- scoped_ptr<LayerImpl> owningLayer = LayerImpl::create(hostImpl.activeTree(), 2);
- owningLayer->createRenderSurface();
- ASSERT_TRUE(owningLayer->renderSurface());
- owningLayer->drawProperties().render_target = owningLayer.get();
- RenderSurfaceImpl* renderSurface = owningLayer->renderSurface();
+ scoped_ptr<LayerImpl> owningLayer = LayerImpl::Create(hostImpl.activeTree(), 2);
+ owningLayer->CreateRenderSurface();
+ ASSERT_TRUE(owningLayer->render_surface());
+ owningLayer->draw_properties().render_target = owningLayer.get();
+ RenderSurfaceImpl* renderSurface = owningLayer->render_surface();
- rootLayer->addChild(owningLayer.Pass());
+ rootLayer->AddChild(owningLayer.Pass());
gfx::Rect contentRect = gfx::Rect(gfx::Point(), gfx::Size(50, 50));
gfx::Transform origin;
« no previous file with comments | « cc/render_surface_impl.cc ('k') | cc/resource_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698