UI Resource Manager

cc/trees/layer_tree_host_impl.h

Index: cc/trees/layer_tree_host_impl.h
===================================================================
--- cc/trees/layer_tree_host_impl.h	(revision 210393)
+++ cc/trees/layer_tree_host_impl.h	(working copy)
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "cc/animation/animation_events.h"
@@ -24,7 +25,9 @@
 #include "cc/output/output_surface_client.h"
 #include "cc/output/renderer.h"
 #include "cc/quads/render_pass.h"
+#include "cc/resources/resource_provider.h"
 #include "cc/resources/tile_manager.h"
+#include "cc/resources/ui_resource_manager.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPicture.h"
@@ -44,7 +47,6 @@
 class MemoryHistory;
 class RenderingStatsInstrumentation;
 class RenderPassDrawQuad;
-class ResourceProvider;
 class TopControlsManager;
 struct RendererCapabilities;
 
@@ -77,6 +79,9 @@
   virtual void RequestScrollbarAnimationOnImplThread(base::TimeDelta delay) = 0;
   virtual void DidActivatePendingTree() = 0;
 
+  virtual void UIResourceCreatedOnImplThread(UIResourceId uid) = 0;

[aelias_OOO_until_Jul13, 2013/07/10 23:07:22]

"UIResourceReadyOnImplThread" would be a better name as "creation" is a nebulous
concept here.

[powei, 2013/07/11 23:54:44]

Done.

+  virtual void UIResourceLostOnImplThread(UIResourceId uid) = 0;
+
  protected:
   virtual ~LayerTreeHostImplClient() {}
 };
@@ -374,6 +379,13 @@
 
   bool page_scale_animation_active() const { return !!page_scale_animation_; }
 
+  void CreateUIResource(UIResourceId uid,
+                        scoped_refptr<UIResourceBitmap> bitmap,
+                        bool async);

[aelias_OOO_until_Jul13, 2013/07/10 23:07:22]

Sorry, I meant to delete this "async" boolean from my design doc, you can get
rid of it.

[powei, 2013/07/11 23:54:44]

Done.

+  // Deletes a UI resource.  May safely be called more than once.
+  void DeleteUIResource(UIResourceId uid);
+  ResourceProvider::ResourceId ResourceIdForUIResource(UIResourceId uid) const;
+
  protected:
   LayerTreeHostImpl(
       const LayerTreeSettings& settings,
@@ -440,6 +452,10 @@
   void SetManagedMemoryPolicy(const ManagedMemoryPolicy& policy);
   void EnforceManagedMemoryPolicy(const ManagedMemoryPolicy& policy);
 
+  typedef base::hash_map<UIResourceId, ResourceProvider::ResourceId>
+    UIResourceMap;
+  UIResourceMap ui_resource_map_;
+
   scoped_ptr<OutputSurface> output_surface_;
 
   // |resource_provider_| and |tile_manager_| can be NULL, e.g. when using tile-