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

Side by Side Diff: ui/gl/gl_surface_android.cc

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 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
« no previous file with comments | « ui/gl/gl_surface_android.h ('k') | ui/gl/gl_surface_cgl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/gfx/gl/gl_surface_android.h" 5 #include "ui/gl/gl_surface_android.h"
6 6
7 #include <EGL/egl.h> 7 #include <EGL/egl.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "ui/gfx/gl/egl_util.h" 11 #include "ui/gl/android_native_window.h"
12 #include "ui/gfx/gl/gl_bindings.h" 12 #include "ui/gl/egl_util.h"
13 #include "ui/gfx/gl/gl_context.h" 13 #include "ui/gl/gl_bindings.h"
14 #include "ui/gfx/gl/gl_implementation.h" 14 #include "ui/gl/gl_context.h"
15 #include "ui/gfx/gl/android_native_window.h" 15 #include "ui/gl/gl_implementation.h"
16 16
17 namespace gfx { 17 namespace gfx {
18 18
19 bool GLSurface::InitializeOneOffInternal() { 19 bool GLSurface::InitializeOneOffInternal() {
20 static bool initialized = false; 20 static bool initialized = false;
21 if (initialized) 21 if (initialized)
22 return true; 22 return true;
23 23
24 switch (GetGLImplementation()) { 24 switch (GetGLImplementation()) {
25 case kGLImplementationEGLGLES2: 25 case kGLImplementationEGLGLES2:
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 DCHECK(GetHandle()); 172 DCHECK(GetHandle());
173 NativeViewGLSurfaceEGL::Destroy(); 173 NativeViewGLSurfaceEGL::Destroy();
174 window_ = NULL; 174 window_ = NULL;
175 175
176 pbuffer_surface_ = new PbufferGLSurfaceEGL(false, Size(1,1)); 176 pbuffer_surface_ = new PbufferGLSurfaceEGL(false, Size(1,1));
177 pbuffer_surface_->Initialize(); 177 pbuffer_surface_->Initialize();
178 } 178 }
179 } 179 }
180 180
181 } // namespace gfx 181 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_android.h ('k') | ui/gl/gl_surface_cgl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698