| Index: chromecast/ui/gl/gl_image_cast.cc
|
| diff --git a/ui/gl/gl_image_ozone.cc b/chromecast/ui/gl/gl_image_cast.cc
|
| similarity index 73%
|
| copy from ui/gl/gl_image_ozone.cc
|
| copy to chromecast/ui/gl/gl_image_cast.cc
|
| index a1c13296aae350753acdf900fd529e583276d5fe..a0efb96f5e50e74e17be95b1b4ce5daf304f7100 100644
|
| --- a/ui/gl/gl_image_ozone.cc
|
| +++ b/chromecast/ui/gl/gl_image_cast.cc
|
| @@ -1,11 +1,10 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2014 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| #include "ui/gl/gl_image.h"
|
|
|
| #include "base/debug/trace_event.h"
|
| -#include "ui/gl/gl_image_egl.h"
|
| #include "ui/gl/gl_image_stub.h"
|
| #include "ui/gl/gl_implementation.h"
|
|
|
| @@ -14,10 +13,15 @@ namespace gfx {
|
| scoped_refptr<GLImage> GLImage::CreateGLImage(gfx::PluginWindowHandle window) {
|
| TRACE_EVENT0("gpu", "GLImage::CreateGLImage");
|
| switch (GetGLImplementation()) {
|
| - case kGLImplementationOSMesaGL:
|
| + case kGLImplementationOSMesaGL: {
|
| return NULL;
|
| - case kGLImplementationEGLGLES2:
|
| + }
|
| + case kGLImplementationDesktopGL: {
|
| return NULL;
|
| + }
|
| + case kGLImplementationEGLGLES2: {
|
| + return NULL;
|
| + }
|
| case kGLImplementationMockGL:
|
| return new GLImageStub;
|
| default:
|
| @@ -32,10 +36,15 @@ scoped_refptr<GLImage> GLImage::CreateGLImageForGpuMemoryBuffer(
|
| unsigned internalformat) {
|
| TRACE_EVENT0("gpu", "GLImage::CreateGLImageForGpuMemoryBuffer");
|
| switch (GetGLImplementation()) {
|
| - case kGLImplementationOSMesaGL:
|
| + case kGLImplementationOSMesaGL: {
|
| + return NULL;
|
| + }
|
| + case kGLImplementationDesktopGL: {
|
| return NULL;
|
| - case kGLImplementationEGLGLES2:
|
| + }
|
| + case kGLImplementationEGLGLES2: {
|
| return NULL;
|
| + }
|
| case kGLImplementationMockGL:
|
| return new GLImageStub;
|
| default:
|
|
|