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

Side by Side Diff: ui/gl/gl_image_linux.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_glx.h" 8 #include "ui/gl/gl_image_glx.h"
9 #include "ui/gl/gl_image_stub.h" 9 #include "ui/gl/gl_image_stub.h"
10 #include "ui/gl/gl_implementation.h" 10 #include "ui/gl/gl_implementation.h"
(...skipping 17 matching lines...) Expand all
28 return NULL; 28 return NULL;
29 } 29 }
30 case kGLImplementationMockGL: 30 case kGLImplementationMockGL:
31 return new GLImageStub; 31 return new GLImageStub;
32 default: 32 default:
33 NOTREACHED(); 33 NOTREACHED();
34 return NULL; 34 return NULL;
35 } 35 }
36 } 36 }
37 37
38 scoped_refptr<GLImage> GLImage::CreateGLImageForPixelBuffer(
39 gfx::PixelBufferHandle window, const gfx::Size& size) {
40 TRACE_EVENT0("gpu", "GLImage::CreateGLImageForPixelBuffer");
41 switch (GetGLImplementation()) {
reveman 2013/04/05 00:13:24 Please return NULL here for kGLImplementationOSMes
kaanb 2013/04/05 01:02:52 Done.
42 case kGLImplementationMockGL:
43 return new GLImageStub;
44 default:
45 NOTREACHED();
46 return NULL;
47 }
48 return NULL;
reveman 2013/04/05 00:13:24 nit: "return NULL" is redundant.
kaanb 2013/04/05 01:02:52 Done.
49 }
50
38 } // namespace gfx 51 } // namespace gfx
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698