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

Unified Diff: trunk/src/ui/aura/bench/bench_main.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/ui/aura/bench/DEPS ('k') | trunk/src/ui/aura/demo/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/aura/bench/bench_main.cc
===================================================================
--- trunk/src/ui/aura/bench/bench_main.cc (revision 247809)
+++ trunk/src/ui/aura/bench/bench_main.cc (working copy)
@@ -29,8 +29,6 @@
#include "ui/gfx/canvas.h"
#include "ui/gfx/rect.h"
#include "ui/gfx/skia_util.h"
-#include "ui/gl/gl_surface.h"
-
#ifndef GL_GLEXT_PROTOTYPES
#define GL_GLEXT_PROTOTYPES 1
#endif
@@ -293,8 +291,6 @@
base::AtExitManager exit_manager;
- gfx::GLSurface::InitializeOneOff();
-
// The ContextFactory must exist before any Compositors are created.
bool allow_test_contexts = false;
ui::InitializeContextFactoryForTests(allow_test_contexts);
« no previous file with comments | « trunk/src/ui/aura/bench/DEPS ('k') | trunk/src/ui/aura/demo/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698