Android: Don't destroy LayerTreeHost when Surface goes away

ui/android/resources/ui_resource_provider.h

 // 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.
 
 #ifndef UI_ANDROID_RESOURCES_UI_RESOURCE_PROVIDER_H_
 #define UI_ANDROID_RESOURCES_UI_RESOURCE_PROVIDER_H_
 
 #include "base/containers/hash_tables.h"

[jdduke (slow), 2015/09/30 17:19:44]

Nit: Looks like we don't need the hash include.

[no sievers, 2015/09/30 21:58:48]

Done.

 #include "cc/resources/ui_resource_client.h"
 #include "ui/android/ui_android_export.h"
 
 namespace cc {
 class LayerTreeHost;

[jdduke (slow), 2015/09/30 17:19:44]

Nit: Looks like we can lose this decl.

[no sievers, 2015/09/30 21:58:48]

Done.

 }
 
 namespace ui {
 
-class UIResourceClientAndroid;
-
 class UI_ANDROID_EXPORT UIResourceProvider {
  public:
-  UIResourceProvider();
-  ~UIResourceProvider();
+  virtual cc::UIResourceId CreateUIResource(cc::UIResourceClient* client) = 0;
+  virtual void DeleteUIResource(cc::UIResourceId resource_id) = 0;
+  virtual bool SupportsETC1NonPowerOfTwo() const = 0;
 
-  void SetLayerTreeHost(cc::LayerTreeHost* host);
-
-  void UIResourcesAreInvalid();
-
-  virtual cc::UIResourceId CreateUIResource(
-      ui::UIResourceClientAndroid* client);
-
-  virtual void DeleteUIResource(cc::UIResourceId resource_id);
-
-  void SetSupportsETC1NonPowerOfTwo(bool supports_etc1_npot) {
-    supports_etc1_npot_ = supports_etc1_npot;
-  }
-
-  virtual bool SupportsETC1NonPowerOfTwo() const;
-
- private:
-  typedef base::hash_map<cc::UIResourceId, ui::UIResourceClientAndroid*>
-      UIResourceClientMap;
-  UIResourceClientMap ui_resource_client_map_;
-  cc::LayerTreeHost* host_;
-  bool supports_etc1_npot_;
-
-  DISALLOW_COPY_AND_ASSIGN(UIResourceProvider);
+ protected:
+  UIResourceProvider() {}

[jdduke (slow), 2015/09/30 17:19:44]

Do we need the constructor?

[no sievers, 2015/09/30 21:58:48]

Done.

+  virtual ~UIResourceProvider() {}
 };
 
 }  // namespace ui
 
 #endif  // UI_ANDROID_RESOURCES_UI_RESOURCE_PROVIDER_H_