summaryrefslogtreecommitdiffstats
path: root/cc/surfaces/surface_display_output_surface_unittest.cc
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2015-08-18 10:18:51 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-18 17:19:36 +0000
commitaf0ab609b53c64ce43172be42e20e7ca8beab497 (patch)
treeed60dc919d12170d57e64d17a3d2f0471cd3dd15 /cc/surfaces/surface_display_output_surface_unittest.cc
parent4924118f2dd3246df9f45efd010b590bc8771f8d (diff)
downloadchromium_src-af0ab609b53c64ce43172be42e20e7ca8beab497.zip
chromium_src-af0ab609b53c64ce43172be42e20e7ca8beab497.tar.gz
chromium_src-af0ab609b53c64ce43172be42e20e7ca8beab497.tar.bz2
Re-land: cc: Use worker context for one-copy tile initialization.
This moves management of staging resources to OneCopyTileTaskWorkerPool class. This makes it possible to use a worker context to issue and detect when copy operations complete. BUG=490295 TBR=jamesr@chromium.org, sky@chromium.org CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1230203007 Cr-Commit-Position: refs/heads/master@{#343947}
Diffstat (limited to 'cc/surfaces/surface_display_output_surface_unittest.cc')
-rw-r--r--cc/surfaces/surface_display_output_surface_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/surfaces/surface_display_output_surface_unittest.cc b/cc/surfaces/surface_display_output_surface_unittest.cc
index 922dd9e..daabafe 100644
--- a/cc/surfaces/surface_display_output_surface_unittest.cc
+++ b/cc/surfaces/surface_display_output_surface_unittest.cc
@@ -60,7 +60,8 @@ class SurfaceDisplayOutputSurfaceTest : public testing::Test {
context_provider_(TestContextProvider::Create()),
surface_display_output_surface_(&surface_manager_,
&allocator_,
- context_provider_) {
+ context_provider_,
+ nullptr) {
output_surface_ = display_client_.output_surface();
display_client_.set_surface_output_surface(
&surface_display_output_surface_);