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

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

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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/converters/surfaces/surfaces_type_converters.cc ('k') | net/BUILD.gn » ('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"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 << " should be namespace " << id_namespace_; 75 << " should be namespace " << id_namespace_;
76 return; 76 return;
77 } 77 }
78 if (!display_) { 78 if (!display_) {
79 display_.reset(new cc::Display(this, manager_, NULL, NULL)); 79 display_.reset(new cc::Display(this, manager_, NULL, NULL));
80 client_->SetDisplay(display_.get()); 80 client_->SetDisplay(display_.get());
81 display_->Initialize(make_scoped_ptr(new DirectOutputSurface( 81 display_->Initialize(make_scoped_ptr(new DirectOutputSurface(
82 new ContextProviderMojo(command_buffer_handle_.Pass())))); 82 new ContextProviderMojo(command_buffer_handle_.Pass()))));
83 } 83 }
84 factory_.Create(cc_id, size.To<gfx::Size>()); 84 factory_.Create(cc_id, size.To<gfx::Size>());
85 display_->Resize(cc_id, size.To<gfx::Size>()); 85 display_->Resize(cc_id, size.To<gfx::Size>(), 1.f);
86 } 86 }
87 87
88 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) { 88 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) {
89 Array<ReturnedResourcePtr> ret(resources.size()); 89 Array<ReturnedResourcePtr> ret(resources.size());
90 for (size_t i = 0; i < resources.size(); ++i) { 90 for (size_t i = 0; i < resources.size(); ++i) {
91 ret[i] = ReturnedResource::From(resources[i]); 91 ret[i] = ReturnedResource::From(resources[i]);
92 } 92 }
93 client()->ReturnResources(ret.Pass()); 93 client()->ReturnResources(ret.Pass());
94 } 94 }
95 95
(...skipping 10 matching lines...) Expand all
106 base::TimeDelta interval) { 106 base::TimeDelta interval) {
107 } 107 }
108 108
109 void SurfacesImpl::OutputSurfaceLost() { 109 void SurfacesImpl::OutputSurfaceLost() {
110 } 110 }
111 111
112 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) { 112 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) {
113 } 113 }
114 114
115 } // namespace mojo 115 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/converters/surfaces/surfaces_type_converters.cc ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698