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

Unified Diff: content/common/gpu/gpu_command_buffer_stub.cc

Issue 12038095: Android webview fix gpu crashes after destroy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More fixes Created 7 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
Index: content/common/gpu/gpu_command_buffer_stub.cc
diff --git a/content/common/gpu/gpu_command_buffer_stub.cc b/content/common/gpu/gpu_command_buffer_stub.cc
index a8bb1c58d2379139a0cc52d36d18dd465f57d600..fd92b70fdb823889387f2c4daf4a383acb526f9b 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -426,7 +426,13 @@ void GpuCommandBufferStub::OnInitialize(
// Need to adjust at least GLX to be able to create the initial context
// with a config that is compatible with onscreen and offscreen surfaces.
context = NULL;
- LOG(FATAL) << "Failed to initialize virtual GL context.";
+
+ // Ensure the decoder is not destroyed if it is not initialized.
+ decoder_.reset();
+
+ DLOG(ERROR) << "Failed to initialize virtual GL context.";
+ OnInitializeFailed(reply_message);
+ return;
boliu 2013/01/26 01:18:00 Daniel...would this be better? I can't get it to f
no sievers 2013/01/28 19:46:15 I'm surprised the failure here did not go away wit
} else {
LOG(INFO) << "Created virtual GL context.";
}

Powered by Google App Engine
This is Rietveld 408576698