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

Unified Diff: cc/layers/surface_layer_unittest.cc

Issue 2140383005: cc: Decouple LayerTreeTests from FakeOutputSurface expectations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@novirtualswapbuffers
Patch Set: layertreetest-outputsurface: more-more-more-android Created 4 years, 5 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 | « no previous file | cc/test/layer_tree_test.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 bc602993cfa77ed581fa554f1758ff4fb07f72a0..4471fa5223442eb101681eb3bff27624342c7cd4 100644
--- a/cc/layers/surface_layer_unittest.cc
+++ b/cc/layers/surface_layer_unittest.cc
@@ -181,6 +181,13 @@ class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise {
public:
SurfaceLayerSwapPromiseWithDraw() : SurfaceLayerSwapPromise() {}
+ std::unique_ptr<OutputSurface> CreateOutputSurface() override {
+ auto ret = delegating_renderer() ? FakeOutputSurface::CreateDelegating3d()
+ : FakeOutputSurface::Create3d();
+ output_surface_ = ret.get();
+ return std::move(ret);
+ }
+
void ChangeTree() override {
++commit_count_;
switch (commit_count_) {
@@ -198,7 +205,7 @@ class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise {
void SwapBuffersCompleteOnThread() override {
std::vector<uint32_t>& satisfied =
- output_surface()->last_sent_frame()->metadata.satisfies_sequences;
+ output_surface_->last_sent_frame()->metadata.satisfies_sequences;
EXPECT_LE(satisfied.size(), 1u);
if (satisfied.size() == 1) {
// Eventually the one SurfaceSequence should be satisfied, but only
@@ -218,6 +225,8 @@ class SurfaceLayerSwapPromiseWithDraw : public SurfaceLayerSwapPromise {
// callback.
EXPECT_TRUE(satisfied_sequence_.is_null());
}
+
+ FakeOutputSurface* output_surface_;
};
// TODO(jbauman): Reenable on single thread once http://crbug.com/421923 is
« no previous file with comments | « no previous file | cc/test/layer_tree_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698