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

Unified Diff: cc/layers/surface_layer_unittest.cc

Issue 2585543003: Revert of Getting rid of CompositorFrameMetadata::satisfies_sequences (Closed)
Patch Set: Created 4 years 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/layers/surface_layer.cc ('k') | cc/output/compositor_frame_metadata.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/surface_layer_unittest.cc
diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc
index f288f7103be627dd8c44773fef9dbd6676c216c9..5720f71fa8f09503dfdf273eccd0e9cd64e4a9fc 100644
--- a/cc/layers/surface_layer_unittest.cc
+++ b/cc/layers/surface_layer_unittest.cc
@@ -8,7 +8,6 @@
#include <vector>
#include "base/location.h"
-#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "cc/animation/animation_host.h"
@@ -112,7 +111,6 @@
// Layer was removed so sequence from second LayerTreeHost should be
// satisfied.
- base::RunLoop().RunUntilIdle();
EXPECT_TRUE(blank_change == expected2);
// Set of sequences that need to be satisfied should include sequences from
@@ -128,7 +126,6 @@
// Layer was removed so sequence from first LayerTreeHost should be
// satisfied.
- base::RunLoop().RunUntilIdle();
EXPECT_TRUE(blank_change == expected1);
// No more SurfaceSequences should have been generated that need to have be
@@ -206,11 +203,25 @@
layer_tree()->SetRootLayer(blank_layer_);
break;
case 2:
- EndTest();
break;
default:
NOTREACHED();
break;
+ }
+ }
+
+ void DisplayReceivedCompositorFrameOnThread(
+ const CompositorFrame& frame) override {
+ const std::vector<uint32_t>& satisfied = frame.metadata.satisfies_sequences;
+ EXPECT_LE(satisfied.size(), 1u);
+ if (satisfied.size() == 1) {
+ // Eventually the one SurfaceSequence should be satisfied, but only
+ // after the layer was removed from the tree, and only once.
+ EXPECT_EQ(1u, satisfied[0]);
+ EXPECT_LE(1, commit_count_);
+ EXPECT_FALSE(sequence_was_satisfied_);
+ sequence_was_satisfied_ = true;
+ EndTest();
}
}
@@ -218,8 +229,9 @@
EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId,
LocalFrameId(1, kArbitraryToken)));
EXPECT_EQ(1u, required_set_.size());
- EXPECT_TRUE(satisfied_sequence_ ==
- SurfaceSequence(kArbitraryFrameSinkId, 1u));
+ // Sequence should have been satisfied through Swap, not with the
+ // callback.
+ EXPECT_FALSE(satisfied_sequence_.is_valid());
}
};
@@ -257,6 +269,7 @@
EXPECT_TRUE(required_id_ == SurfaceId(kArbitraryFrameSinkId,
LocalFrameId(1, kArbitraryToken)));
EXPECT_EQ(1u, required_set_.size());
+ // Sequence should have been satisfied with the callback.
EXPECT_TRUE(satisfied_sequence_ ==
SurfaceSequence(kArbitraryFrameSinkId, 1u));
}
« no previous file with comments | « cc/layers/surface_layer.cc ('k') | cc/output/compositor_frame_metadata.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698