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

Side by Side Diff: ui/gl/gl_image_x11.cc

Issue 20017005: gpu: Refactor GpuMemoryBuffer framework for multi-process support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/gl/gl_image.h" 5 #include "ui/gl/gl_image.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "ui/gl/gl_image_glx.h" 8 #include "ui/gl/gl_image_glx.h"
9 #include "ui/gl/gl_image_shm.h"
9 #include "ui/gl/gl_image_stub.h" 10 #include "ui/gl/gl_image_stub.h"
10 #include "ui/gl/gl_implementation.h" 11 #include "ui/gl/gl_implementation.h"
11 12
12 namespace gfx { 13 namespace gfx {
13 14
14 scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) { 15 scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
15 TRACE_EVENT0("gpu", "GLImage::CreateGLImage"); 16 TRACE_EVENT0("gpu", "GLImage::CreateGLImage");
16 switch (GetGLImplementation()) { 17 switch (GetGLImplementation()) {
17 case kGLImplementationOSMesaGL: 18 case kGLImplementationOSMesaGL:
18 return NULL; 19 return NULL;
(...skipping 14 matching lines...) Expand all
33 } 34 }
34 } 35 }
35 36
36 scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer( 37 scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
37 gfx::GpuMemoryBufferHandle buffer, gfx::Size size) { 38 gfx::GpuMemoryBufferHandle buffer, gfx::Size size) {
38 TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer"); 39 TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer");
39 switch (GetGLImplementation()) { 40 switch (GetGLImplementation()) {
40 case kGLImplementationOSMesaGL: 41 case kGLImplementationOSMesaGL:
41 case kGLImplementationDesktopGL: 42 case kGLImplementationDesktopGL:
42 case kGLImplementationEGLGLES2: 43 case kGLImplementationEGLGLES2:
43 return NULL; 44 switch (buffer.type) {
45 case SHARED_MEMORY_BUFFER: {
46 scoped_refptr<GLImageShm> image(new GLImageShm(size));
47 if (!image->Initialize(buffer))
48 return NULL;
49
50 return image;
51 }
52 default:
53 NOTREACHED();
54 return NULL;
55 }
44 case kGLImplementationMockGL: 56 case kGLImplementationMockGL:
45 return new GLImageStub; 57 return new GLImageStub;
46 default: 58 default:
47 NOTREACHED(); 59 NOTREACHED();
48 return NULL; 60 return NULL;
49 } 61 }
50 } 62 }
51 63
52 } // namespace gfx 64 } // namespace gfx
OLDNEW
« ui/gfx/gpu_memory_buffer.h ('K') | « ui/gl/gl_image_win.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698