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

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

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 years, 1 month 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
« no previous file with comments | « cc/surfaces/display_unittest.cc ('k') | cc/surfaces/surface.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/onscreen_display_client.h" 5 #include "cc/surfaces/onscreen_display_client.h"
6 6
7 #include "base/trace_event/trace_event.h" 7 #include "base/trace_event/trace_event.h"
8 #include "cc/output/output_surface.h" 8 #include "cc/output/output_surface.h"
9 #include "cc/scheduler/begin_frame_source.h" 9 #include "cc/scheduler/begin_frame_source.h"
10 #include "cc/surfaces/display_scheduler.h" 10 #include "cc/surfaces/display_scheduler.h"
11 #include "cc/surfaces/surface_display_output_surface.h" 11 #include "cc/surfaces/surface_display_output_surface.h"
12 #include "cc/surfaces/surface_factory.h" 12 #include "cc/surfaces/surface_factory.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 OnscreenDisplayClient::OnscreenDisplayClient( 17 OnscreenDisplayClient::OnscreenDisplayClient(
18 scoped_ptr<OutputSurface> output_surface, 18 scoped_ptr<OutputSurface> output_surface,
19 SurfaceManager* manager, 19 SurfaceManager* manager,
20 SharedBitmapManager* bitmap_manager, 20 SharedBitmapManager* bitmap_manager,
21 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, 21 gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
22 const RendererSettings& settings, 22 const RendererSettings& settings,
23 scoped_refptr<base::SingleThreadTaskRunner> task_runner) 23 scoped_refptr<base::SingleThreadTaskRunner> task_runner)
24 : output_surface_(output_surface.Pass()), 24 : output_surface_(std::move(output_surface)),
25 task_runner_(task_runner), 25 task_runner_(task_runner),
26 display_(new Display(this, 26 display_(new Display(this,
27 manager, 27 manager,
28 bitmap_manager, 28 bitmap_manager,
29 gpu_memory_buffer_manager, 29 gpu_memory_buffer_manager,
30 settings)), 30 settings)),
31 output_surface_lost_(false), 31 output_surface_lost_(false),
32 disable_display_vsync_(settings.disable_display_vsync) {} 32 disable_display_vsync_(settings.disable_display_vsync) {}
33 33
34 OnscreenDisplayClient::~OnscreenDisplayClient() { 34 OnscreenDisplayClient::~OnscreenDisplayClient() {
(...skipping 10 matching lines...) Expand all
45 } else { 45 } else {
46 synthetic_frame_source_ = SyntheticBeginFrameSource::Create( 46 synthetic_frame_source_ = SyntheticBeginFrameSource::Create(
47 task_runner_.get(), BeginFrameArgs::DefaultInterval()); 47 task_runner_.get(), BeginFrameArgs::DefaultInterval());
48 frame_source = synthetic_frame_source_.get(); 48 frame_source = synthetic_frame_source_.get();
49 } 49 }
50 50
51 scheduler_.reset( 51 scheduler_.reset(
52 new DisplayScheduler(display_.get(), frame_source, task_runner_.get(), 52 new DisplayScheduler(display_.get(), frame_source, task_runner_.get(),
53 output_surface_->capabilities().max_frames_pending)); 53 output_surface_->capabilities().max_frames_pending));
54 54
55 return display_->Initialize(output_surface_.Pass(), scheduler_.get()); 55 return display_->Initialize(std::move(output_surface_), scheduler_.get());
56 } 56 }
57 57
58 void OnscreenDisplayClient::CommitVSyncParameters(base::TimeTicks timebase, 58 void OnscreenDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
59 base::TimeDelta interval) { 59 base::TimeDelta interval) {
60 if (interval == base::TimeDelta()) { 60 if (interval == base::TimeDelta()) {
61 // TODO(brianderson): We should not be receiving 0 intervals. 61 // TODO(brianderson): We should not be receiving 0 intervals.
62 interval = BeginFrameArgs::DefaultInterval(); 62 interval = BeginFrameArgs::DefaultInterval();
63 } 63 }
64 64
65 surface_display_output_surface_->ReceivedVSyncParameters(timebase, interval); 65 surface_display_output_surface_->ReceivedVSyncParameters(timebase, interval);
66 if (synthetic_frame_source_.get()) 66 if (synthetic_frame_source_.get())
67 synthetic_frame_source_->OnUpdateVSyncParameters(timebase, interval); 67 synthetic_frame_source_->OnUpdateVSyncParameters(timebase, interval);
68 } 68 }
69 69
70 void OnscreenDisplayClient::OutputSurfaceLost() { 70 void OnscreenDisplayClient::OutputSurfaceLost() {
71 output_surface_lost_ = true; 71 output_surface_lost_ = true;
72 surface_display_output_surface_->DidLoseOutputSurface(); 72 surface_display_output_surface_->DidLoseOutputSurface();
73 } 73 }
74 74
75 void OnscreenDisplayClient::SetMemoryPolicy(const ManagedMemoryPolicy& policy) { 75 void OnscreenDisplayClient::SetMemoryPolicy(const ManagedMemoryPolicy& policy) {
76 surface_display_output_surface_->SetMemoryPolicy(policy); 76 surface_display_output_surface_->SetMemoryPolicy(policy);
77 } 77 }
78 78
79 } // namespace cc 79 } // namespace cc
OLDNEW
« no previous file with comments | « cc/surfaces/display_unittest.cc ('k') | cc/surfaces/surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698