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

Unified Diff: content/browser/renderer_host/surface_texture_transport_client_android.cc

Issue 12038095: Android webview fix gpu crashes after destroy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: SetNativeWidget in ~SurfaceTextureTransportClient 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/browser/renderer_host/surface_texture_transport_client_android.cc
diff --git a/content/browser/renderer_host/surface_texture_transport_client_android.cc b/content/browser/renderer_host/surface_texture_transport_client_android.cc
index 8c2b8d34166603fce761ad12e96f684ff5d4cdae..dd3ebb4a6eaa2c7237f21a93b13d98d32809501f 100644
--- a/content/browser/renderer_host/surface_texture_transport_client_android.cc
+++ b/content/browser/renderer_host/surface_texture_transport_client_android.cc
@@ -27,10 +27,14 @@ namespace content {
SurfaceTextureTransportClient::SurfaceTextureTransportClient()
: window_(NULL),
- texture_id_(0) {
+ texture_id_(0),
+ surface_id_(0) {
}
SurfaceTextureTransportClient::~SurfaceTextureTransportClient() {
+ if (surface_id_)
no sievers 2013/01/28 23:05:03 parentheses
boliu 2013/01/28 23:42:13 Done.
+ GpuSurfaceTracker::Get()->SetNativeWidget(
+ surface_id_, gfx::kNullAcceleratedWidget);
if (window_)
ANativeWindow_release(window_);
}
@@ -51,6 +55,8 @@ scoped_refptr<cc::Layer> SurfaceTextureTransportClient::Initialize() {
gfx::GLSurfaceHandle
SurfaceTextureTransportClient::GetCompositingSurface(int surface_id) {
DCHECK(surface_id);
+ surface_id_ = surface_id;
+
if (!window_)
window_ = surface_texture_->CreateSurface();

Powered by Google App Engine
This is Rietveld 408576698