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

Side by Side Diff: mojo/services/surfaces/surfaces_impl.cc

Issue 640023004: cc: Make OutputSurface::SwapBuffers pure virtual (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@latinfo
Patch Set: rebase, comment, removed unused includes Created 6 years, 2 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/mojo_examples.gypi ('k') | ui/compositor/test/in_process_context_factory.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/services/surfaces/surfaces_impl.h" 5 #include "mojo/services/surfaces/surfaces_impl.h"
6 6
7 #include "cc/output/compositor_frame.h" 7 #include "cc/output/compositor_frame.h"
8 #include "cc/resources/returned_resource.h" 8 #include "cc/resources/returned_resource.h"
9 #include "cc/surfaces/display.h" 9 #include "cc/surfaces/display.h"
10 #include "cc/surfaces/surface_id_allocator.h" 10 #include "cc/surfaces/surface_id_allocator.h"
11 #include "mojo/cc/context_provider_mojo.h" 11 #include "mojo/cc/context_provider_mojo.h"
12 #include "mojo/cc/direct_output_surface.h"
12 #include "mojo/converters/geometry/geometry_type_converters.h" 13 #include "mojo/converters/geometry/geometry_type_converters.h"
13 #include "mojo/converters/surfaces/surfaces_type_converters.h" 14 #include "mojo/converters/surfaces/surfaces_type_converters.h"
14 15
15 namespace mojo { 16 namespace mojo {
16 17
17 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager, 18 SurfacesImpl::SurfacesImpl(cc::SurfaceManager* manager,
18 uint32_t id_namespace, 19 uint32_t id_namespace,
19 Client* client) 20 Client* client)
20 : manager_(manager), 21 : manager_(manager),
21 factory_(manager, this), 22 factory_(manager, this),
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { 71 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
71 // Bad message, do something bad to the caller? 72 // Bad message, do something bad to the caller?
72 LOG(FATAL) << "Received request for id " << cc_id.id << " namespace " 73 LOG(FATAL) << "Received request for id " << cc_id.id << " namespace "
73 << cc::SurfaceIdAllocator::NamespaceForId(cc_id) 74 << cc::SurfaceIdAllocator::NamespaceForId(cc_id)
74 << " should be namespace " << id_namespace_; 75 << " should be namespace " << id_namespace_;
75 return; 76 return;
76 } 77 }
77 if (!display_) { 78 if (!display_) {
78 display_.reset(new cc::Display(this, manager_, NULL)); 79 display_.reset(new cc::Display(this, manager_, NULL));
79 client_->SetDisplay(display_.get()); 80 client_->SetDisplay(display_.get());
80 display_->Initialize(make_scoped_ptr(new cc::OutputSurface( 81 display_->Initialize(make_scoped_ptr(new DirectOutputSurface(
81 new ContextProviderMojo(command_buffer_handle_.Pass())))); 82 new ContextProviderMojo(command_buffer_handle_.Pass()))));
82 } 83 }
83 factory_.Create(cc_id, size.To<gfx::Size>()); 84 factory_.Create(cc_id, size.To<gfx::Size>());
84 display_->Resize(cc_id, size.To<gfx::Size>()); 85 display_->Resize(cc_id, size.To<gfx::Size>());
85 } 86 }
86 87
87 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) { 88 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) {
88 Array<ReturnedResourcePtr> ret(resources.size()); 89 Array<ReturnedResourcePtr> ret(resources.size());
89 for (size_t i = 0; i < resources.size(); ++i) { 90 for (size_t i = 0; i < resources.size(); ++i) {
90 ret[i] = ReturnedResource::From(resources[i]); 91 ret[i] = ReturnedResource::From(resources[i]);
(...skipping 14 matching lines...) Expand all
105 base::TimeDelta interval) { 106 base::TimeDelta interval) {
106 } 107 }
107 108
108 void SurfacesImpl::OutputSurfaceLost() { 109 void SurfacesImpl::OutputSurfaceLost() {
109 } 110 }
110 111
111 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) { 112 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) {
112 } 113 }
113 114
114 } // namespace mojo 115 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | ui/compositor/test/in_process_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698