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

Unified Diff: ui/gl/gl_surface_mac.cc

Issue 56833002: Add a basic NativeViewportMac for Mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address ben's feedback Created 7 years, 1 month 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
« no previous file with comments | « ui/gl/gl_context_nsview.mm ('k') | ui/gl/gl_surface_nsview.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_mac.cc
diff --git a/ui/gl/gl_surface_mac.cc b/ui/gl/gl_surface_mac.cc
index 7cd54618669365158cbc37b3a19acdad81a34ba4..d6bf072fd5b3490e71d9e78aeef30a253d7dfa15 100644
--- a/ui/gl/gl_surface_mac.cc
+++ b/ui/gl/gl_surface_mac.cc
@@ -13,10 +13,7 @@
#include "ui/gl/gl_surface_cgl.h"
#include "ui/gl/gl_surface_osmesa.h"
#include "ui/gl/gl_surface_stub.h"
-
-#if defined(USE_AURA)
#include "ui/gl/gl_surface_nsview.h"
-#endif
namespace gfx {
@@ -38,7 +35,6 @@ bool GLSurface::InitializeOneOffInternal() {
scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
gfx::AcceleratedWidget window) {
TRACE_EVENT0("gpu", "GLSurface::CreateViewGLSurface");
-#if defined(USE_AURA)
switch (GetGLImplementation()) {
case kGLImplementationDesktopGL:
case kGLImplementationAppleGL: {
@@ -54,9 +50,6 @@ scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface(
NOTREACHED();
return NULL;
}
-#else
- return CreateOffscreenGLSurface(gfx::Size(1, 1));
-#endif
}
scoped_refptr<GLSurface> GLSurface::CreateOffscreenGLSurface(
« no previous file with comments | « ui/gl/gl_context_nsview.mm ('k') | ui/gl/gl_surface_nsview.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698