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

Unified 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: Add expectations to the unittests for GetErrors() coming from the suppressor 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 side-by-side diff with in-line comments
Download patch
Index: ui/gl/gl_image_mac.cc
diff --git a/ui/gl/gl_image_mac.cc b/ui/gl/gl_image_mac.cc
index a4b522aff62385d481d045a109c52f47bf4137b9..54cbd522907007d7fde7e0286a2e22629fd14432 100644
--- a/ui/gl/gl_image_mac.cc
+++ b/ui/gl/gl_image_mac.cc
@@ -15,9 +15,24 @@ scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
switch (GetGLImplementation()) {
case kGLImplementationOSMesaGL:
case kGLImplementationDesktopGL:
- case kGLImplementationAppleGL: {
+ case kGLImplementationAppleGL:
+ return NULL;
+ case kGLImplementationMockGL:
+ return new GLImageStub;
+ default:
+ NOTREACHED();
+ return NULL;
+ }
+}
+
+scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
+ gfx::GpuMemoryBufferHandle buffer, gfx::Size size) {
+ TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer");
+ switch (GetGLImplementation()) {
+ case kGLImplementationOSMesaGL:
+ case kGLImplementationDesktopGL:
+ case kGLImplementationAppleGL:
return NULL;
- }
case kGLImplementationMockGL:
return new GLImageStub;
default:

Powered by Google App Engine
This is Rietveld 408576698