Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "content/browser/compositor/onscreen_display_client.h" | 5 #include "content/browser/compositor/onscreen_display_client.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "cc/output/output_surface.h" | 8 #include "cc/output/output_surface.h" |
| 9 #include "cc/surfaces/surface_factory.h" | 9 #include "cc/surfaces/surface_factory.h" |
| 10 #include "cc/surfaces/surface_manager.h" | 10 #include "cc/surfaces/surface_manager.h" |
| 11 #include "content/browser/compositor/surface_display_output_surface.h" | |
| 11 #include "content/common/host_shared_bitmap_manager.h" | 12 #include "content/common/host_shared_bitmap_manager.h" |
| 12 | 13 |
| 13 namespace content { | 14 namespace content { |
| 14 | 15 |
| 15 OnscreenDisplayClient::OnscreenDisplayClient( | 16 OnscreenDisplayClient::OnscreenDisplayClient( |
| 16 scoped_ptr<cc::OutputSurface> output_surface, | 17 scoped_ptr<cc::OutputSurface> output_surface, |
| 17 cc::SurfaceManager* manager, | 18 cc::SurfaceManager* manager, |
| 18 scoped_refptr<base::SingleThreadTaskRunner> task_runner) | 19 scoped_refptr<base::SingleThreadTaskRunner> task_runner) |
| 19 : output_surface_(output_surface.Pass()), | 20 : output_surface_(output_surface.Pass()), |
| 20 display_( | 21 display_( |
| 21 new cc::Display(this, manager, HostSharedBitmapManager::current())), | 22 new cc::Display(this, manager, HostSharedBitmapManager::current())), |
| 22 task_runner_(task_runner), | 23 task_runner_(task_runner), |
| 23 scheduled_draw_(false), | 24 scheduled_draw_(false), |
| 24 weak_ptr_factory_(this) { | 25 weak_ptr_factory_(this) { |
| 25 } | 26 } |
| 26 | 27 |
| 27 OnscreenDisplayClient::~OnscreenDisplayClient() { | 28 OnscreenDisplayClient::~OnscreenDisplayClient() { |
| 28 } | 29 } |
| 29 | 30 |
| 30 scoped_ptr<cc::OutputSurface> OnscreenDisplayClient::CreateOutputSurface() { | 31 scoped_ptr<cc::OutputSurface> OnscreenDisplayClient::CreateOutputSurface() { |
| 31 DCHECK(output_surface_.get()); | 32 DCHECK(output_surface_.get()); |
| 32 return output_surface_.Pass(); | 33 return output_surface_.Pass(); |
| 33 } | 34 } |
| 34 | 35 |
| 36 void OnscreenDisplayClient::CommitVSyncParameters(base::TimeTicks timebase, | |
| 37 base::TimeDelta interval) { | |
| 38 surface_display_output_surface_->ReceivedVSyncParameters(timebase, interval); | |
|
jamesr
2014/09/17 05:47:11
we have an output_surface_ member already, and we
| |
| 39 } | |
| 40 | |
| 35 void OnscreenDisplayClient::DisplayDamaged() { | 41 void OnscreenDisplayClient::DisplayDamaged() { |
| 36 if (scheduled_draw_) | 42 if (scheduled_draw_) |
| 37 return; | 43 return; |
| 38 TRACE_EVENT0("content", "OnscreenDisplayClient::DisplayDamaged"); | 44 TRACE_EVENT0("content", "OnscreenDisplayClient::DisplayDamaged"); |
| 39 scheduled_draw_ = true; | 45 scheduled_draw_ = true; |
| 40 task_runner_->PostTask( | 46 task_runner_->PostTask( |
| 41 FROM_HERE, | 47 FROM_HERE, |
| 42 base::Bind(&OnscreenDisplayClient::Draw, weak_ptr_factory_.GetWeakPtr())); | 48 base::Bind(&OnscreenDisplayClient::Draw, weak_ptr_factory_.GetWeakPtr())); |
| 43 } | 49 } |
| 44 | 50 |
| 45 void OnscreenDisplayClient::Draw() { | 51 void OnscreenDisplayClient::Draw() { |
| 46 TRACE_EVENT0("content", "OnscreenDisplayClient::Draw"); | 52 TRACE_EVENT0("content", "OnscreenDisplayClient::Draw"); |
| 47 scheduled_draw_ = false; | 53 scheduled_draw_ = false; |
| 48 display_->Draw(); | 54 display_->Draw(); |
| 49 } | 55 } |
| 50 | 56 |
| 51 } // namespace content | 57 } // namespace content |
| OLD | NEW |