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

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: Remove unneeded changes. 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 2df5aebb0e47c7dd0fc14e619ffebb80f6890214..5d7be0ce741248256348feea885d427e4c1c75da 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;
} else {
LOG(INFO) << "Created virtual GL context.";
}

Powered by Google App Engine
This is Rietveld 408576698