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

Unified Diff: cc/test/layer_tree_test.h

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 | « cc/layers/surface_layer_unittest.cc ('k') | cc/test/layer_tree_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/test/layer_tree_test.h
diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h
index 6ed2e35fed8ffc95757e7caf587c23347a9fc05f..140cc7927bf9135796c0aa718f94d5d31738546f 100644
--- a/cc/test/layer_tree_test.h
+++ b/cc/test/layer_tree_test.h
@@ -148,7 +148,6 @@ class LayerTreeTest : public testing::Test, public TestHooks {
LayerTreeHost* layer_tree_host();
LayerTreeHost* remote_client_layer_tree_host();
bool delegating_renderer() const { return delegating_renderer_; }
- FakeOutputSurface* output_surface() { return output_surface_; }
SharedBitmapManager* shared_bitmap_manager() const {
return shared_bitmap_manager_.get();
}
@@ -174,12 +173,9 @@ class LayerTreeTest : public testing::Test, public TestHooks {
// By default, output surface recreation is synchronous.
void RequestNewOutputSurface() override;
- // Override this for pixel tests, where you need a real output surface.
+ // Override this for pixel tests, where you need a real output surface, or
+ // if you want to control the output surface used for drawing.
virtual std::unique_ptr<OutputSurface> CreateOutputSurface();
- // Override this for unit tests, which should not produce pixel output.
- virtual std::unique_ptr<FakeOutputSurface> CreateFakeOutputSurface();
-
- TestWebGraphicsContext3D* TestContext();
bool IsRemoteTest() const;
@@ -196,7 +192,6 @@ class LayerTreeTest : public testing::Test, public TestHooks {
// The LayerTreeHost created by the cc embedder on the client in remote mode.
std::unique_ptr<LayerTreeHostForTesting> remote_client_layer_tree_host_;
- FakeOutputSurface* output_surface_;
FakeExternalBeginFrameSource* external_begin_frame_source_;
RemoteProtoChannelBridge remote_proto_channel_bridge_;
« no previous file with comments | « cc/layers/surface_layer_unittest.cc ('k') | cc/test/layer_tree_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698