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

Unified Diff: trunk/src/media/tools/player_x11/gl_video_renderer.cc

Issue 149953003: Revert 247793 "Ensure GL initialization only happens once, and p..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 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
« no previous file with comments | « trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc ('k') | trunk/src/ui/aura/bench/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/tools/player_x11/gl_video_renderer.cc
===================================================================
--- trunk/src/media/tools/player_x11/gl_video_renderer.cc (revision 247809)
+++ trunk/src/media/tools/player_x11/gl_video_renderer.cc (working copy)
@@ -11,7 +11,7 @@
#include "media/base/buffers.h"
#include "media/base/video_frame.h"
#include "media/base/yuv_convert.h"
-#include "ui/gl/gl_surface.h"
+#include "ui/gl/gl_implementation.h"
enum { kNumYUVPlanes = 3 };
@@ -20,8 +20,8 @@
// dlopen/dlsym, and so linking it into chrome breaks it. So we dynamically
// load it, and use glew to dynamically resolve symbols.
// See http://code.google.com/p/chromium/issues/detail?id=16800
- if (!gfx::GLSurface::InitializeOneOff()) {
- LOG(ERROR) << "GLSurface::InitializeOneOff failed";
+ if (!InitializeStaticGLBindings(gfx::kGLImplementationDesktopGL)) {
+ LOG(ERROR) << "InitializeStaticGLBindings failed";
return NULL;
}
« no previous file with comments | « trunk/src/gpu/tools/compositor_model_bench/compositor_model_bench.cc ('k') | trunk/src/ui/aura/bench/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698