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

Side by Side Diff: cc/surfaces/surface_display_output_surface.cc

Issue 1273163004: Revert of cc: Use worker context for one-copy tile initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/surfaces/surface_display_output_surface.h" 5 #include "cc/surfaces/surface_display_output_surface.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "cc/output/compositor_frame.h" 8 #include "cc/output/compositor_frame.h"
9 #include "cc/output/compositor_frame_ack.h" 9 #include "cc/output/compositor_frame_ack.h"
10 #include "cc/surfaces/display.h" 10 #include "cc/surfaces/display.h"
11 #include "cc/surfaces/onscreen_display_client.h" 11 #include "cc/surfaces/onscreen_display_client.h"
12 #include "cc/surfaces/surface.h" 12 #include "cc/surfaces/surface.h"
13 #include "cc/surfaces/surface_manager.h" 13 #include "cc/surfaces/surface_manager.h"
14 14
15 namespace cc { 15 namespace cc {
16 16
17 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface( 17 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface(
18 SurfaceManager* surface_manager, 18 SurfaceManager* surface_manager,
19 SurfaceIdAllocator* allocator, 19 SurfaceIdAllocator* allocator,
20 const scoped_refptr<ContextProvider>& context_provider, 20 const scoped_refptr<ContextProvider>& context_provider)
21 const scoped_refptr<ContextProvider>& worker_context_provider) 21 : OutputSurface(context_provider),
22 : OutputSurface(context_provider, worker_context_provider),
23 display_client_(NULL), 22 display_client_(NULL),
24 factory_(surface_manager, this), 23 factory_(surface_manager, this),
25 allocator_(allocator) { 24 allocator_(allocator) {
26 factory_.set_needs_sync_points(false); 25 factory_.set_needs_sync_points(false);
27 capabilities_.delegated_rendering = true; 26 capabilities_.delegated_rendering = true;
28 capabilities_.max_frames_pending = 1; 27 capabilities_.max_frames_pending = 1;
29 capabilities_.adjust_deadline_for_parent = true; 28 capabilities_.adjust_deadline_for_parent = true;
30 capabilities_.can_force_reclaim_resources = true; 29 capabilities_.can_force_reclaim_resources = true;
31 // Display and SurfaceDisplayOutputSurface share a GL context, so sync 30 // Display and SurfaceDisplayOutputSurface share a GL context, so sync
32 // points aren't needed when passing resources between them. 31 // points aren't needed when passing resources between them.
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 if (client_) 90 if (client_)
92 client_->ReclaimResources(&ack); 91 client_->ReclaimResources(&ack);
93 } 92 }
94 93
95 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) { 94 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) {
96 if (client_ && !display_client_->output_surface_lost()) 95 if (client_ && !display_client_->output_surface_lost())
97 client_->DidSwapBuffersComplete(); 96 client_->DidSwapBuffersComplete();
98 } 97 }
99 98
100 } // namespace cc 99 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/surface_display_output_surface.h ('k') | cc/surfaces/surface_display_output_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698