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

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

Issue 634083002: gpu: Compositor management of GpuMemoryBuffer instances. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cc-pre-chromium-image-refactor
Patch Set: mac build fix 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
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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 68
69 cc::SurfaceId cc_id = id.To<cc::SurfaceId>(); 69 cc::SurfaceId cc_id = id.To<cc::SurfaceId>();
70 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) { 70 if (cc::SurfaceIdAllocator::NamespaceForId(cc_id) != id_namespace_) {
71 // Bad message, do something bad to the caller? 71 // Bad message, do something bad to the caller?
72 LOG(FATAL) << "Received request for id " << cc_id.id << " namespace " 72 LOG(FATAL) << "Received request for id " << cc_id.id << " namespace "
73 << cc::SurfaceIdAllocator::NamespaceForId(cc_id) 73 << cc::SurfaceIdAllocator::NamespaceForId(cc_id)
74 << " should be namespace " << id_namespace_; 74 << " should be namespace " << id_namespace_;
75 return; 75 return;
76 } 76 }
77 if (!display_) { 77 if (!display_) {
78 display_.reset(new cc::Display(this, manager_, NULL)); 78 display_.reset(new cc::Display(this, manager_, NULL, NULL));
79 client_->SetDisplay(display_.get()); 79 client_->SetDisplay(display_.get());
80 display_->Initialize(make_scoped_ptr(new cc::OutputSurface( 80 display_->Initialize(make_scoped_ptr(new cc::OutputSurface(
81 new ContextProviderMojo(command_buffer_handle_.Pass())))); 81 new ContextProviderMojo(command_buffer_handle_.Pass()))));
82 } 82 }
83 factory_.Create(cc_id, size.To<gfx::Size>()); 83 factory_.Create(cc_id, size.To<gfx::Size>());
84 display_->Resize(cc_id, size.To<gfx::Size>()); 84 display_->Resize(cc_id, size.To<gfx::Size>());
85 } 85 }
86 86
87 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) { 87 void SurfacesImpl::ReturnResources(const cc::ReturnedResourceArray& resources) {
88 Array<ReturnedResourcePtr> ret(resources.size()); 88 Array<ReturnedResourcePtr> ret(resources.size());
(...skipping 16 matching lines...) Expand all
105 base::TimeDelta interval) { 105 base::TimeDelta interval) {
106 } 106 }
107 107
108 void SurfacesImpl::OutputSurfaceLost() { 108 void SurfacesImpl::OutputSurfaceLost() {
109 } 109 }
110 110
111 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) { 111 void SurfacesImpl::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) {
112 } 112 }
113 113
114 } // namespace mojo 114 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698