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

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: Style 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 f6872d5f5f7d56cecbd586bd96c50da902872ec6..049492716087f877320ef2f161bcc371a1c8ff85 100644
--- a/content/common/gpu/gpu_command_buffer_stub.cc
+++ b/content/common/gpu/gpu_command_buffer_stub.cc
@@ -411,7 +411,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.";
}
« no previous file with comments | « content/browser/renderer_host/surface_texture_transport_client_android.cc ('k') | content/common/gpu/gpu_surface_lookup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698