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

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 2017263002: cc: Move copy requests from layers to the effect tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo in comment Created 4 years, 7 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/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 9d3e4f64ead24694592163a94b590a9d3c0a498a..10ce52d7afa9fa3a13af99a947781e9d2fff7802 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -3302,11 +3302,8 @@ class DidDrawCheckLayer : public LayerImpl {
static void IgnoreResult(std::unique_ptr<CopyOutputResult> result) {}
void AddCopyRequest() {
- std::vector<std::unique_ptr<CopyOutputRequest>> requests;
- requests.push_back(
+ test_properties()->copy_requests.push_back(
CopyOutputRequest::CreateRequest(base::Bind(&IgnoreResult)));
- test_properties()->force_render_surface = true;
- PassCopyRequests(&requests);
}
protected:
@@ -7785,12 +7782,10 @@ TEST_F(LayerTreeHostImplTest, ShutdownReleasesContext) {
SetupRootLayerImpl(LayerImpl::Create(host_impl_->active_tree(), 1));
- std::vector<std::unique_ptr<CopyOutputRequest>> requests;
- requests.push_back(CopyOutputRequest::CreateRequest(
- base::Bind(&ShutdownReleasesContext_Callback)));
-
LayerImpl* root = host_impl_->active_tree()->root_layer();
- root->PassCopyRequests(&requests);
+ root->test_properties()->copy_requests.push_back(
+ CopyOutputRequest::CreateRequest(
+ base::Bind(&ShutdownReleasesContext_Callback)));
LayerTreeHostImpl::FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, PrepareToDrawFrame(&frame));
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698