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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/delegated_renderer_layer_impl_unittest.cc

Issue 924973003: CC: Force push properties for all layers when tracing is started (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments addressed Created 5 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
« cc/debug/frame_viewer_instrumentation.cc ('K') | « cc/debug/frame_viewer_instrumentation.cc ('k') | cc/layers/layer.h » ('j') | cc/trees/layer_tree_host.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/delegated_renderer_layer_impl_unittest.cc
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index 87e559af4fe0bcab12b8004a290b4f3c1ade83c2..f47b0b4eca4bc969cd62110001a8ced2c87857b3 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -177,7 +177,7 @@ TEST_F(DelegatedRendererLayerImplTest,
host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Root layer has one render pass, and delegated renderer layer has two
@@ -199,7 +199,7 @@ TEST_F(DelegatedRendererLayerImplTest,
// Force damage to redraw a new frame.
host_impl_->SetViewportDamage(gfx::Rect(10, 10));
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -258,7 +258,7 @@ TEST_F(DelegatedRendererLayerImplTest,
host_impl_->pending_tree()->SetRootLayer(root_layer.Pass());
host_impl_->ActivateSyncTree();
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Root layer has one render pass, and delegated renderer layer has two
@@ -283,7 +283,7 @@ TEST_F(DelegatedRendererLayerImplTest,
host_impl_->ActivateSyncTree();
host_impl_->SetViewportDamage(gfx::Rect(100, 100));
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Root layer has one render pass, and delegated renderer layer no longer
@@ -296,7 +296,7 @@ TEST_F(DelegatedRendererLayerImplTest,
}
TEST_F(DelegatedRendererLayerImplTestSimple, AddsContributingRenderPasses) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -330,7 +330,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, AddsContributingRenderPasses) {
TEST_F(DelegatedRendererLayerImplTestSimple,
AddsQuadsToContributingRenderPasses) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -365,7 +365,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
}
TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -393,7 +393,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) {
TEST_F(DelegatedRendererLayerImplTestSimple,
QuadsFromRootRenderPassAreModifiedForTheTarget) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -427,7 +427,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
}
TEST_F(DelegatedRendererLayerImplTestSimple, RenderPassTransformIsModified) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// The delegated layer has a surface between it and the root.
@@ -468,7 +468,7 @@ class DelegatedRendererLayerImplTestOwnSurface
};
TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsRenderPasses) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -507,7 +507,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsRenderPasses) {
TEST_F(DelegatedRendererLayerImplTestOwnSurface,
AddsQuadsToContributingRenderPasses) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -544,7 +544,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface,
}
TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -570,7 +570,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) {
TEST_F(DelegatedRendererLayerImplTestOwnSurface,
QuadsFromRootRenderPassAreNotModifiedForTheTarget) {
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
@@ -747,7 +747,7 @@ class DelegatedRendererLayerImplTestTransform
}
void VerifyRenderPasses(
- const LayerTreeHostImpl::FrameData& frame,
+ const FrameData& frame,
size_t num_render_passes,
const SharedQuadState** root_delegated_shared_quad_state,
const SharedQuadState** contrib_delegated_shared_quad_state) {
@@ -799,7 +799,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_NoSurface) {
root_delegated_render_pass_is_clipped_ = false;
SetUpTest();
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = nullptr;
@@ -854,7 +854,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) {
root_delegated_render_pass_is_clipped_ = true;
SetUpTest();
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = nullptr;
@@ -915,7 +915,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {
delegated_renderer_layer_->SetHasRenderSurface(true);
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = nullptr;
@@ -964,7 +964,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {
delegated_renderer_layer_->SetHasRenderSurface(true);
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = nullptr;
@@ -1012,7 +1012,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, MismatchedDeviceScaleFactor) {
SetUpTest();
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = nullptr;
@@ -1209,7 +1209,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = false;
SetUpTest();
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
ASSERT_EQ(2u, frame.render_passes.size());
@@ -1238,7 +1238,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = false;
SetUpTest();
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
ASSERT_EQ(2u, frame.render_passes.size());
@@ -1267,7 +1267,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = true;
SetUpTest();
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
ASSERT_EQ(2u, frame.render_passes.size());
@@ -1297,7 +1297,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = true;
SetUpTest();
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
ASSERT_EQ(2u, frame.render_passes.size());
@@ -1328,7 +1328,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
delegated_renderer_layer_->SetHasRenderSurface(true);
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
ASSERT_EQ(3u, frame.render_passes.size());
@@ -1357,7 +1357,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
delegated_renderer_layer_->SetHasRenderSurface(true);
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
ASSERT_EQ(3u, frame.render_passes.size());
@@ -1387,7 +1387,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
delegated_renderer_layer_->SetHasRenderSurface(true);
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
ASSERT_EQ(3u, frame.render_passes.size());
@@ -1415,7 +1415,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) {
delegated_renderer_layer_->SetHasRenderSurface(true);
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
ASSERT_EQ(3u, frame.render_passes.size());
@@ -1476,7 +1476,7 @@ TEST_F(DelegatedRendererLayerImplTest, InvalidRenderPassDrawQuad) {
root_layer->AddChild(delegated_renderer_layer.Pass());
host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
- LayerTreeHostImpl::FrameData frame;
+ FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
// The DelegatedRendererLayerImpl should drop the bad RenderPassDrawQuad.
« cc/debug/frame_viewer_instrumentation.cc ('K') | « cc/debug/frame_viewer_instrumentation.cc ('k') | cc/layers/layer.h » ('j') | cc/trees/layer_tree_host.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698