Android: Don't destroy LayerTreeHost when Surface goes away

chrome/browser/android/compositor/tab_content_manager.cc

 // Copyright 2014 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/tab_content_manager.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 132 matching lines @@
 }
 
 TabContentManager::~TabContentManager() {
 }
 
 void TabContentManager::Destroy(JNIEnv* env, jobject obj) {
   thumbnail_cache_->RemoveThumbnailCacheObserver(this);
   delete this;
 }
 
-void TabContentManager::SetUIResourceProvider(JNIEnv* env,
-                                              jobject obj,
-                                              jlong ui_resource_provider_ptr) {
-  ui::UIResourceProvider* ui_resource_provider =
-      reinterpret_cast<ui::UIResourceProvider*>(ui_resource_provider_ptr);
-  SetUIResourceProvider(ui_resource_provider);
-}
-
 void TabContentManager::SetUIResourceProvider(
     ui::UIResourceProvider* ui_resource_provider) {
   thumbnail_cache_->SetUIResourceProvider(ui_resource_provider);
 }
 
 scoped_refptr<cc::Layer> TabContentManager::GetLiveLayer(int tab_id) {
   scoped_refptr<cc::Layer> layer = live_layer_list_[tab_id];
   if (!layer.get())
     return NULL;
 
@@ skipping 164 matching lines @@
 void TabContentManager::GetDecompressedThumbnail(JNIEnv* env,
                                                  jobject obj,
                                                  jint tab_id) {
   base::Callback<void(bool, SkBitmap)> decompress_done_callback =
       base::Bind(&TabContentManager::OnFinishDecompressThumbnail,
                  weak_factory_.GetWeakPtr(), reinterpret_cast<int>(tab_id));
   thumbnail_cache_->DecompressThumbnailFromFile(reinterpret_cast<int>(tab_id),
                                                 decompress_done_callback);
 }
 
+void TabContentManager::OnUIResourcesWereEvicted() {
+  thumbnail_cache_->OnUIResourcesWereEvicted();
+}
+
 void TabContentManager::OnFinishedThumbnailRead(int tab_id) {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_TabContentManager_notifyListenersOfThumbnailChange(
       env, weak_java_tab_content_manager_.get(env).obj(), tab_id);
 }
 
 void TabContentManager::PutThumbnailIntoCache(int tab_id,
                                               float thumbnail_scale,
                                               const SkBitmap& bitmap) {
   TabReadbackRequestMap::iterator readback_iter =
@@ skipping 23 matching lines @@
            jboolean use_approximation_thumbnail) {
   TabContentManager* manager = new TabContentManager(
       env, obj, default_cache_size, approximation_cache_size,
       compression_queue_max_size, write_queue_max_size,
       use_approximation_thumbnail);
   return reinterpret_cast<intptr_t>(manager);
 }
 
 }  // namespace android
 }  // namespace chrome