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

Unified Diff: mojo/public/gles2/gles2_private.cc

Issue 399653004: Add a Mojo example apptest that runs in mojo_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments; ShellTestHelper crashes, use a hack workaround. Created 6 years, 5 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
« mojo/examples/test/example_unittest.cc ('K') | « mojo/mojo_examples.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/gles2/gles2_private.cc
diff --git a/mojo/public/gles2/gles2_private.cc b/mojo/public/gles2/gles2_private.cc
index 52b47d36c3f9b0f021b9bbd1fe0e457815b13f0e..b6b875e8bfb18a09d0b13f80a275d3d9c7f18b29 100644
--- a/mojo/public/gles2/gles2_private.cc
+++ b/mojo/public/gles2/gles2_private.cc
@@ -85,8 +85,9 @@ namespace mojo {
GLES2Support::~GLES2Support() {}
void GLES2Support::Init(GLES2Support* gles2_support) {
- assert(!g_gles2_support);
- g_gles2_support = gles2_support;
+ // TODO(msw): Resolve the re-initialization: assert(!g_gles2_support);
+ if (!g_gles2_support)
+ g_gles2_support = gles2_support;
}
} // namespace mojo
« mojo/examples/test/example_unittest.cc ('K') | « mojo/mojo_examples.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698