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

Unified Diff: ui/gfx/gl/gl_context_egl.cc

Issue 8060045: Use shared D3D9 texture to transport the compositor's backing buffer to the browser... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/gfx/gl/gl_context_egl.cc
===================================================================
--- ui/gfx/gl/gl_context_egl.cc (revision 106500)
+++ ui/gfx/gl/gl_context_egl.cc (working copy)
@@ -8,8 +8,8 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "third_party/angle/include/EGL/egl.h"
-#include "ui/gfx/gl/gl_surface_egl.h"
#include "ui/gfx/gl/egl_util.h"
+#include "ui/gfx/gl/gl_surface.h"
// This header must come after the above third-party include, as
// it brings in #defines that cause conflicts.
@@ -52,9 +52,8 @@
EGL_NONE
};
- GLSurfaceEGL* egl_surface = static_cast<GLSurfaceEGL*>(compatible_surface);
- display_ = egl_surface->GetDisplay();
- config_ = egl_surface->GetConfig();
+ display_ = compatible_surface->GetDisplay();
+ config_ = compatible_surface->GetConfig();
context_ = eglCreateContext(
display_,
« gpu/DEPS ('K') | « ui/gfx/gl/generate_bindings.py ('k') | ui/gfx/gl/gl_context_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698