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

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

Issue 649533003: C++11 declares a type safe null pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed Presubmit errors 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 "content/common/gpu/gpu_memory_buffer_factory.h" 5 #include "content/common/gpu/gpu_memory_buffer_factory.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/common/gpu/gpu_memory_buffer_factory_io_surface.h" 8 #include "content/common/gpu/gpu_memory_buffer_factory_io_surface.h"
9 #include "ui/gl/gl_image.h" 9 #include "ui/gl/gl_image.h"
10 #include "ui/gl/gl_image_shared_memory.h" 10 #include "ui/gl/gl_image_shared_memory.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer( 43 virtual scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
44 const gfx::GpuMemoryBufferHandle& handle, 44 const gfx::GpuMemoryBufferHandle& handle,
45 const gfx::Size& size, 45 const gfx::Size& size,
46 unsigned internalformat, 46 unsigned internalformat,
47 int client_id) override { 47 int client_id) override {
48 switch (handle.type) { 48 switch (handle.type) {
49 case gfx::SHARED_MEMORY_BUFFER: { 49 case gfx::SHARED_MEMORY_BUFFER: {
50 scoped_refptr<gfx::GLImageSharedMemory> image( 50 scoped_refptr<gfx::GLImageSharedMemory> image(
51 new gfx::GLImageSharedMemory(size, internalformat)); 51 new gfx::GLImageSharedMemory(size, internalformat));
52 if (!image->Initialize(handle)) 52 if (!image->Initialize(handle))
53 return NULL; 53 return nullptr;
54 54
55 return image; 55 return image;
56 } 56 }
57 case gfx::IO_SURFACE_BUFFER: { 57 case gfx::IO_SURFACE_BUFFER: {
58 // Verify that client is the owner of the buffer we're about to use. 58 // Verify that client is the owner of the buffer we're about to use.
59 if (handle.global_id.secondary_id != client_id) 59 if (handle.global_id.secondary_id != client_id)
60 return scoped_refptr<gfx::GLImage>(); 60 return scoped_refptr<gfx::GLImage>();
61 61
62 return io_surface_factory_.CreateImageForGpuMemoryBuffer( 62 return io_surface_factory_.CreateImageForGpuMemoryBuffer(
63 handle.global_id, size, internalformat); 63 handle.global_id, size, internalformat);
(...skipping 10 matching lines...) Expand all
74 74
75 } // namespace 75 } // namespace
76 76
77 // static 77 // static
78 scoped_ptr<GpuMemoryBufferFactory> GpuMemoryBufferFactory::Create() { 78 scoped_ptr<GpuMemoryBufferFactory> GpuMemoryBufferFactory::Create() {
79 return make_scoped_ptr<GpuMemoryBufferFactory>( 79 return make_scoped_ptr<GpuMemoryBufferFactory>(
80 new GpuMemoryBufferFactoryImpl); 80 new GpuMemoryBufferFactoryImpl);
81 } 81 }
82 82
83 } // namespace content 83 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_memory_buffer_factory_io_surface.cc ('k') | content/common/gpu/gpu_memory_buffer_factory_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698