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

Side by Side Diff: content/common/gpu/gpu_memory_buffer_factory_io_surface.cc

Issue 1299713003: GLImage::OnMemoryDump Stubs + Some Impls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@images1.3
Patch Set: Fix android build. Created 5 years, 4 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 | « no previous file | content/common/gpu/stream_texture_android.h » ('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 "content/common/gpu/gpu_memory_buffer_factory_io_surface.h" 5 #include "content/common/gpu/gpu_memory_buffer_factory_io_surface.h"
6 6
7 #include <CoreFoundation/CoreFoundation.h> 7 #include <CoreFoundation/CoreFoundation.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 int client_id) { 201 int client_id) {
202 base::AutoLock lock(io_surfaces_lock_); 202 base::AutoLock lock(io_surfaces_lock_);
203 203
204 DCHECK_EQ(handle.type, gfx::IO_SURFACE_BUFFER); 204 DCHECK_EQ(handle.type, gfx::IO_SURFACE_BUFFER);
205 IOSurfaceMapKey key(handle.id, client_id); 205 IOSurfaceMapKey key(handle.id, client_id);
206 IOSurfaceMap::iterator it = io_surfaces_.find(key); 206 IOSurfaceMap::iterator it = io_surfaces_.find(key);
207 if (it == io_surfaces_.end()) 207 if (it == io_surfaces_.end())
208 return scoped_refptr<gfx::GLImage>(); 208 return scoped_refptr<gfx::GLImage>();
209 209
210 scoped_refptr<gfx::GLImageIOSurface> image( 210 scoped_refptr<gfx::GLImageIOSurface> image(
211 new gfx::GLImageIOSurface(size, internalformat)); 211 new gfx::GLImageIOSurface(handle.id, size, internalformat));
212 if (!image->Initialize(it->second.get(), format)) 212 if (!image->Initialize(it->second.get(), format))
213 return scoped_refptr<gfx::GLImage>(); 213 return scoped_refptr<gfx::GLImage>();
214 214
215 return image; 215 return image;
216 } 216 }
217 217
218 } // namespace content 218 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/common/gpu/stream_texture_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698