Android: Don't destroy LayerTreeHost when Surface goes away

chrome/browser/android/compositor/compositor_view.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/compositor/compositor_view.h"
 
 #include <vector>
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
@@ skipping 88 matching lines @@
 
   root_layer_->SetIsDrawable(true);
   root_layer_->SetBackgroundColor(SK_ColorWHITE);
 
   toolbar_layer_->layer()->SetHideLayerAndSubtree(true);
   root_layer_->AddChild(toolbar_layer_->layer());
 }
 
 CompositorView::~CompositorView() {
   content::BrowserChildProcessObserver::Remove(this);
+  tab_content_manager_->OnUIResourcesWereEvicted();
 
   // Explicitly reset these scoped_ptrs here because otherwise we callbacks will
   // try to access member variables during destruction.
   compositor_.reset(NULL);
 }
 
 void CompositorView::Destroy(JNIEnv* env, jobject object) {
   delete this;
 }
 
@@ skipping 27 matching lines @@
 }
 
 void CompositorView::SurfaceCreated(JNIEnv* env, jobject object) {
   compositor_->SetRootLayer(root_layer_);
   current_surface_format_ = 0;
 }
 
 void CompositorView::SurfaceDestroyed(JNIEnv* env, jobject object) {
   compositor_->SetSurface(NULL);
   current_surface_format_ = 0;
+  tab_content_manager_->OnUIResourcesWereEvicted();
 }
 
 void CompositorView::SurfaceChanged(JNIEnv* env,
                                     jobject object,
                                     jint format,
                                     jint width,
                                     jint height,
                                     jobject surface) {
   DCHECK(surface);
   if (current_surface_format_ != format) {
@@ skipping 156 matching lines @@
   // through here but through BrowserChildProcessHostDisconnected() instead.
 }
 
 // Register native methods
 bool RegisterCompositorView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace chrome