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

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

Issue 13543007: GLImage support for Android zero-copy pixel buffers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove a TODO and remove pixel_buffer.h from gl.gyp Created 7 years, 8 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_stub.h" 8 #include "ui/gl/gl_image_stub.h"
9 #include "ui/gl/gl_implementation.h" 9 #include "ui/gl/gl_implementation.h"
10 10
11 namespace gfx { 11 namespace gfx {
12 12
13 scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) { 13 scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
14 TRACE_EVENT0("gpu", "GLImage::CreateGLImage"); 14 TRACE_EVENT0("gpu", "GLImage::CreateGLImage");
15 switch (GetGLImplementation()) { 15 switch (GetGLImplementation()) {
16 case kGLImplementationOSMesaGL: 16 case kGLImplementationOSMesaGL:
17 case kGLImplementationDesktopGL: 17 case kGLImplementationDesktopGL:
18 case kGLImplementationAppleGL: { 18 case kGLImplementationAppleGL: {
19 return NULL; 19 return NULL;
20 } 20 }
21 case kGLImplementationMockGL: 21 case kGLImplementationMockGL:
22 return new GLImageStub; 22 return new GLImageStub;
23 default: 23 default:
24 NOTREACHED(); 24 NOTREACHED();
25 return NULL; 25 return NULL;
26 } 26 }
27 } 27 }
28 28
29 scoped_refptr<GLImage> GLImage::CreateGLImageForGraphicBuffer(
30 gfx::GraphicBufferHandle window, const gfx::Size& size) {
31 TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGraphicBuffer");
32 switch (GetGLImplementation()) {
reveman 2013/04/05 00:13:24 Please return NULL here for kGLImplementationOSMes
kaanb 2013/04/05 01:02:52 Done.
33 case kGLImplementationMockGL:
34 return new GLImageStub;
35 default:
36 NOTREACHED();
37 return NULL;
38 }
39 return NULL;
reveman 2013/04/05 00:13:24 nit: "return NULL" is redundant
kaanb 2013/04/05 01:02:52 Done.
40 }
41
29 } // namespace gfx 42 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698