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

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

Issue 1390083002: Revert of ui: Add GLImage unit test framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 "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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 int client_id) { 208 int client_id) {
209 base::AutoLock lock(io_surfaces_lock_); 209 base::AutoLock lock(io_surfaces_lock_);
210 210
211 DCHECK_EQ(handle.type, gfx::IO_SURFACE_BUFFER); 211 DCHECK_EQ(handle.type, gfx::IO_SURFACE_BUFFER);
212 IOSurfaceMapKey key(handle.id, client_id); 212 IOSurfaceMapKey key(handle.id, client_id);
213 IOSurfaceMap::iterator it = io_surfaces_.find(key); 213 IOSurfaceMap::iterator it = io_surfaces_.find(key);
214 if (it == io_surfaces_.end()) 214 if (it == io_surfaces_.end())
215 return scoped_refptr<gfx::GLImage>(); 215 return scoped_refptr<gfx::GLImage>();
216 216
217 scoped_refptr<gfx::GLImageIOSurface> image( 217 scoped_refptr<gfx::GLImageIOSurface> image(
218 new gfx::GLImageIOSurface(size, internalformat)); 218 new gfx::GLImageIOSurface(handle.id, size, internalformat));
219 if (!image->Initialize(it->second.get(), handle.id, format)) 219 if (!image->Initialize(it->second.get(), format))
220 return scoped_refptr<gfx::GLImage>(); 220 return scoped_refptr<gfx::GLImage>();
221 221
222 return image; 222 return image;
223 } 223 }
224 224
225 } // namespace content 225 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_channel.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_shared_memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698