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

Side by Side Diff: components/mus/public/cpp/lib/output_surface.cc

Issue 2002303002: Consolidate OutputSurface constructors into GL vs Vulkan. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: outputsurface-constructors: rebase-and-fixcrash Created 4 years, 6 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 "components/mus/public/cpp/output_surface.h" 5 #include "components/mus/public/cpp/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/output/output_surface_client.h" 10 #include "cc/output/output_surface_client.h"
11 #include "components/mus/public/cpp/window_surface.h" 11 #include "components/mus/public/cpp/window_surface.h"
12 #include "mojo/converters/surfaces/surfaces_type_converters.h" 12 #include "mojo/converters/surfaces/surfaces_type_converters.h"
13 13
14 namespace mus { 14 namespace mus {
15 15
16 OutputSurface::OutputSurface( 16 OutputSurface::OutputSurface(
17 const scoped_refptr<cc::ContextProvider>& context_provider, 17 const scoped_refptr<cc::ContextProvider>& context_provider,
18 std::unique_ptr<mus::WindowSurface> surface) 18 std::unique_ptr<mus::WindowSurface> surface)
19 : cc::OutputSurface(context_provider), surface_(std::move(surface)) { 19 : cc::OutputSurface(context_provider, nullptr, nullptr),
20 surface_(std::move(surface)) {
20 capabilities_.delegated_rendering = true; 21 capabilities_.delegated_rendering = true;
21 } 22 }
22 23
23 OutputSurface::~OutputSurface() {} 24 OutputSurface::~OutputSurface() {}
24 25
25 bool OutputSurface::BindToClient(cc::OutputSurfaceClient* client) { 26 bool OutputSurface::BindToClient(cc::OutputSurfaceClient* client) {
26 surface_->BindToThread(); 27 surface_->BindToThread();
27 surface_->set_client(this); 28 surface_->set_client(this);
28 return cc::OutputSurface::BindToClient(client); 29 return cc::OutputSurface::BindToClient(client);
29 } 30 }
(...skipping 20 matching lines...) Expand all
50 cc::CompositorFrameAck cfa; 51 cc::CompositorFrameAck cfa;
51 cfa.resources = resources.To<cc::ReturnedResourceArray>(); 52 cfa.resources = resources.To<cc::ReturnedResourceArray>();
52 ReclaimResources(&cfa); 53 ReclaimResources(&cfa);
53 } 54 }
54 55
55 void OutputSurface::SwapBuffersComplete() { 56 void OutputSurface::SwapBuffersComplete() {
56 client_->DidSwapBuffersComplete(); 57 client_->DidSwapBuffersComplete();
57 } 58 }
58 59
59 } // namespace mus 60 } // namespace mus
OLDNEW
« no previous file with comments | « components/display_compositor/buffer_queue_unittest.cc ('k') | components/mus/surfaces/direct_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698