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

Side by Side Diff: mojo/cc/output_surface_mojo.cc

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 5 years, 11 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
« no previous file with comments | « mojo/cc/output_surface_mojo.h ('k') | mojo/converters/surfaces/surfaces_type_converters.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 "mojo/cc/output_surface_mojo.h" 5 #include "mojo/cc/output_surface_mojo.h"
6 6
7 #include "cc/output/compositor_frame.h" 7 #include "cc/output/compositor_frame.h"
8 #include "cc/output/output_surface_client.h" 8 #include "cc/output/output_surface_client.h"
9 #include "mojo/converters/geometry/geometry_type_converters.h" 9 #include "mojo/converters/geometry/geometry_type_converters.h"
10 #include "mojo/converters/surfaces/surfaces_type_converters.h" 10 #include "mojo/converters/surfaces/surfaces_type_converters.h"
11 11
12 namespace mojo { 12 namespace mojo {
13 13
14 OutputSurfaceMojo::OutputSurfaceMojo( 14 OutputSurfaceMojo::OutputSurfaceMojo(
15 OutputSurfaceMojoClient* client, 15 OutputSurfaceMojoClient* client,
16 const scoped_refptr<cc::ContextProvider>& context_provider, 16 const scoped_refptr<cc::ContextProvider>& context_provider,
17 SurfacePtr surface, 17 SurfacePtr surface,
18 uint32_t id_namespace) 18 uint32_t id_namespace)
19 : cc::OutputSurface(context_provider), 19 : cc::OutputSurface(context_provider),
20 output_surface_mojo_client_(client), 20 output_surface_mojo_client_(client),
21 surface_(surface.Pass()), 21 surface_(surface.Pass()),
22 id_allocator_(id_namespace) { 22 id_allocator_(id_namespace) {
23 capabilities_.delegated_rendering = true; 23 capabilities_.delegated_rendering = true;
24 capabilities_.max_frames_pending = 1; 24 capabilities_.max_frames_pending = 1;
25 } 25 }
26 26
27 OutputSurfaceMojo::~OutputSurfaceMojo() { 27 OutputSurfaceMojo::~OutputSurfaceMojo() {
28 } 28 }
29 29
30 void OutputSurfaceMojo::SetIdNamespace(uint32_t id_namespace) {
31 }
32
30 void OutputSurfaceMojo::ReturnResources(Array<ReturnedResourcePtr> resources) { 33 void OutputSurfaceMojo::ReturnResources(Array<ReturnedResourcePtr> resources) {
31 } 34 }
32 35
33 bool OutputSurfaceMojo::BindToClient(cc::OutputSurfaceClient* client) { 36 bool OutputSurfaceMojo::BindToClient(cc::OutputSurfaceClient* client) {
34 surface_.set_client(this); 37 surface_.set_client(this);
35 return cc::OutputSurface::BindToClient(client); 38 return cc::OutputSurface::BindToClient(client);
36 } 39 }
37 40
38 void OutputSurfaceMojo::SwapBuffers(cc::CompositorFrame* frame) { 41 void OutputSurfaceMojo::SwapBuffers(cc::CompositorFrame* frame) {
39 gfx::Size frame_size = 42 gfx::Size frame_size =
40 frame->delegated_frame_data->render_pass_list.back()->output_rect.size(); 43 frame->delegated_frame_data->render_pass_list.back()->output_rect.size();
41 if (frame_size != surface_size_) { 44 if (frame_size != surface_size_) {
42 if (!surface_id_.is_null()) { 45 if (!surface_id_.is_null()) {
43 surface_->DestroySurface(SurfaceId::From(surface_id_)); 46 surface_->DestroySurface(SurfaceId::From(surface_id_));
44 } 47 }
45 surface_id_ = id_allocator_.GenerateId(); 48 surface_id_ = id_allocator_.GenerateId();
46 surface_->CreateSurface(SurfaceId::From(surface_id_), 49 surface_->CreateSurface(SurfaceId::From(surface_id_));
47 Size::From(frame_size));
48 output_surface_mojo_client_->DidCreateSurface(surface_id_); 50 output_surface_mojo_client_->DidCreateSurface(surface_id_);
49 surface_size_ = frame_size; 51 surface_size_ = frame_size;
50 } 52 }
51 53
52 surface_->SubmitFrame(SurfaceId::From(surface_id_), Frame::From(*frame), 54 surface_->SubmitFrame(SurfaceId::From(surface_id_), Frame::From(*frame),
53 mojo::Closure()); 55 mojo::Closure());
54 56
55 client_->DidSwapBuffers(); 57 client_->DidSwapBuffers();
56 client_->DidSwapBuffersComplete(); 58 client_->DidSwapBuffersComplete();
57 } 59 }
58 60
59 } // namespace mojo 61 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/cc/output_surface_mojo.h ('k') | mojo/converters/surfaces/surfaces_type_converters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698