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

Unified Diff: ui/gl/gl_image_ozone.cc

Issue 17932004: Support ozone=1 compositor_unittests with OSMesa (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix on linux Created 7 years, 6 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_ozone.cc
diff --git a/ui/gl/gl_image_ozone.cc b/ui/gl/gl_image_ozone.cc
index 1f2865ec7d3543daccc75f74ae04803e3ce73459..c217f9992c822e981e197c7ce88447d5c91216f1 100644
--- a/ui/gl/gl_image_ozone.cc
+++ b/ui/gl/gl_image_ozone.cc
@@ -14,6 +14,8 @@ namespace gfx {
scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
TRACE_EVENT0("gpu", "GLImage::CreateGLImage");
switch (GetGLImplementation()) {
+ case kGLImplementationOSMesaGL:
+ return NULL;
case kGLImplementationEGLGLES2:
return NULL;
case kGLImplementationMockGL:
@@ -28,6 +30,8 @@ scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
gfx::GpuMemoryBufferHandle buffer, gfx::Size size) {
TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer");
switch (GetGLImplementation()) {
+ case kGLImplementationOSMesaGL:
+ return NULL;
case kGLImplementationEGLGLES2:
return NULL;
case kGLImplementationMockGL:
« ui/gl/gl.gyp ('K') | « ui/gl/gl_context_ozone.cc ('k') | ui/gl/gl_implementation_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698