| Index: cc/surfaces/onscreen_display_client.cc
|
| diff --git a/cc/surfaces/onscreen_display_client.cc b/cc/surfaces/onscreen_display_client.cc
|
| index 50b64a78fc5d6fb2e2e7f2c04cf9b7a1142f8a72..85763b4438cd617037ff19b43d29848293d9cce8 100644
|
| --- a/cc/surfaces/onscreen_display_client.cc
|
| +++ b/cc/surfaces/onscreen_display_client.cc
|
| @@ -28,43 +28,14 @@ OnscreenDisplayClient::OnscreenDisplayClient(
|
| bitmap_manager,
|
| gpu_memory_buffer_manager,
|
| settings)),
|
| - output_surface_lost_(false),
|
| - disable_display_vsync_(settings.disable_display_vsync) {}
|
| + output_surface_lost_(false) {}
|
|
|
| OnscreenDisplayClient::~OnscreenDisplayClient() {
|
| }
|
|
|
| bool OnscreenDisplayClient::Initialize() {
|
| DCHECK(output_surface_);
|
| -
|
| - BeginFrameSource* frame_source;
|
| - if (disable_display_vsync_) {
|
| - unthrottled_frame_source_ =
|
| - BackToBackBeginFrameSource::Create(task_runner_.get());
|
| - frame_source = unthrottled_frame_source_.get();
|
| - } else {
|
| - synthetic_frame_source_ = SyntheticBeginFrameSource::Create(
|
| - task_runner_.get(), BeginFrameArgs::DefaultInterval());
|
| - frame_source = synthetic_frame_source_.get();
|
| - }
|
| -
|
| - scheduler_.reset(
|
| - new DisplayScheduler(display_.get(), frame_source, task_runner_.get(),
|
| - output_surface_->capabilities().max_frames_pending));
|
| -
|
| - return display_->Initialize(std::move(output_surface_), scheduler_.get());
|
| -}
|
| -
|
| -void OnscreenDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
|
| - base::TimeDelta interval) {
|
| - if (interval == base::TimeDelta()) {
|
| - // TODO(brianderson): We should not be receiving 0 intervals.
|
| - interval = BeginFrameArgs::DefaultInterval();
|
| - }
|
| -
|
| - surface_display_output_surface_->ReceivedVSyncParameters(timebase, interval);
|
| - if (synthetic_frame_source_.get())
|
| - synthetic_frame_source_->OnUpdateVSyncParameters(timebase, interval);
|
| + return display_->Initialize(std::move(output_surface_), task_runner_.get());
|
| }
|
|
|
| void OnscreenDisplayClient::OutputSurfaceLost() {
|
|
|