diff options
| author | jbauman <jbauman@chromium.org> | 2014-09-04 10:21:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 17:24:43 +0000 |
| commit | 9a9327cae242b995759ddcfb54df41d1d620c45b (patch) | |
| tree | e3dce64e04528a190e783592c5fa16f9e5e86d59 /content/browser/compositor/onscreen_display_client.cc | |
| parent | fd3e9370842824fe3ee79344f1c748c07f826252 (diff) | |
| download | chromium_src-9a9327cae242b995759ddcfb54df41d1d620c45b.zip chromium_src-9a9327cae242b995759ddcfb54df41d1d620c45b.tar.gz chromium_src-9a9327cae242b995759ddcfb54df41d1d620c45b.tar.bz2 | |
Use GpuBrowserCompositorOutputSurface with Surfaces.
This is needed for vsync message filtering and latencyinfo
BUG=
Review URL: https://codereview.chromium.org/511423002
Cr-Commit-Position: refs/heads/master@{#293313}
Diffstat (limited to 'content/browser/compositor/onscreen_display_client.cc')
| -rw-r--r-- | content/browser/compositor/onscreen_display_client.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/content/browser/compositor/onscreen_display_client.cc b/content/browser/compositor/onscreen_display_client.cc index 7c349b05..da60316 100644 --- a/content/browser/compositor/onscreen_display_client.cc +++ b/content/browser/compositor/onscreen_display_client.cc @@ -13,12 +13,10 @@ namespace content { OnscreenDisplayClient::OnscreenDisplayClient( - const scoped_refptr<cc::ContextProvider>& onscreen_context_provider, - scoped_ptr<cc::OutputSurface> software_surface, + scoped_ptr<cc::OutputSurface> output_surface, cc::SurfaceManager* manager, scoped_refptr<base::SingleThreadTaskRunner> task_runner) - : onscreen_context_provider_(onscreen_context_provider), - software_surface_(software_surface.Pass()), + : output_surface_(output_surface.Pass()), display_( new cc::Display(this, manager, HostSharedBitmapManager::current())), task_runner_(task_runner), @@ -30,10 +28,8 @@ OnscreenDisplayClient::~OnscreenDisplayClient() { } scoped_ptr<cc::OutputSurface> OnscreenDisplayClient::CreateOutputSurface() { - if (!onscreen_context_provider_.get()) - return software_surface_.Pass(); - return make_scoped_ptr(new cc::OutputSurface(onscreen_context_provider_)) - .Pass(); + DCHECK(output_surface_.get()); + return output_surface_.Pass(); } void OnscreenDisplayClient::DisplayDamaged() { |