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

Unified Diff: cc/layers/surface_layer_unittest.cc

Issue 2323423002: cc: Add SwapPromiseManager and SurfaceSequenceGenerator. (Closed)
Patch Set: keep LTH in Layer. Created 4 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
Index: cc/layers/surface_layer_unittest.cc
diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc
index 5b745019c0936b14e0b65212e95318d4a75b0363..8a9bd76e1848dd1a2e9535cf3acc0c7149be0e57 100644
--- a/cc/layers/surface_layer_unittest.cc
+++ b/cc/layers/surface_layer_unittest.cc
@@ -74,7 +74,7 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
base::Bind(&RequireCallback, &required_id, &required_seq)));
layer->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
gfx::Size(1, 1));
- layer_tree_host_->SetSurfaceClientId(1);
+ layer_tree_host_->GetSurfaceSequenceGenerator()->set_surface_client_id(1);
layer_tree_->SetRootLayer(layer);
std::unique_ptr<FakeLayerTreeHost> layer_tree_host2 =
@@ -84,7 +84,7 @@ TEST_F(SurfaceLayerTest, MultipleFramesOneSurface) {
base::Bind(&RequireCallback, &required_id, &required_seq)));
layer2->SetSurfaceId(SurfaceId(kArbitraryClientId, 1, 0), 1.f,
gfx::Size(1, 1));
- layer_tree_host2->SetSurfaceClientId(2);
+ layer_tree_host2->GetSurfaceSequenceGenerator()->set_surface_client_id(2);
layer_tree_host2->SetRootLayer(layer2);
// Layers haven't been removed, so no sequence should be satisfied.
@@ -126,7 +126,7 @@ class SurfaceLayerSwapPromise : public LayerTreeTest {
: commit_count_(0), sequence_was_satisfied_(false) {}
void BeginTest() override {
- layer_tree_host()->SetSurfaceClientId(1);
+ layer_tree_host()->GetSurfaceSequenceGenerator()->set_surface_client_id(1);
layer_ = SurfaceLayer::Create(
base::Bind(&SatisfyCallback, &satisfied_sequence_),
base::Bind(&RequireCallback, &required_id_, &required_set_));

Powered by Google App Engine
This is Rietveld 408576698