Update the nine patch layer to use UI resources

content/browser/renderer_host/compositor_impl_android.cc

Index: content/browser/renderer_host/compositor_impl_android.cc
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index 359a6e1a9435d7c5aaaead8cc6158246449735cb..87adcc2babe446618556123fa519204bd1a3622b 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -22,6 +22,8 @@
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface.h"
+#include "cc/resources/scoped_ui_resource.h"
+#include "cc/resources/ui_resource_bitmap.h"
 #include "cc/trees/layer_tree_host.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
@@ -233,7 +235,15 @@ void CompositorImpl::SetSurface(jobject surface) {
 
 void CompositorImpl::SetVisible(bool visible) {
   if (!visible) {
+    for (UIResourceMap::iterator it = ui_resource_map_.begin();
+         it != ui_resource_map_.end();
+         it++) {
+      scoped_ptr<cc::ScopedUIResource> resource(it->second);

[aelias_OOO_until_Jul13, 2013/08/30 06:20:41]

Yuck.  Now I see why you depended on scoped_ptr_hash_map :).  Please switch this
code over now that it's landed.

[powei, 2013/09/03 23:36:05]

Done.

+    }
+
+    ui_resource_map_.clear();
     host_.reset();
+    client_->InvalidateUIResources();
   } else if (!host_) {
     cc::LayerTreeSettings settings;
     settings.compositor_name = "BrowserCompositor";
@@ -261,6 +271,9 @@ void CompositorImpl::SetVisible(bool visible) {
     host_->SetLayerTreeHostClientReady();
     host_->SetViewportSize(size_);
     host_->set_has_transparent_background(has_transparent_background_);
+    // Need to recreate the UI resources because a new LayerTreeHost has been
+    // created.
+    client_->DidLoseUIResources();
   }
 }
 
@@ -292,6 +305,23 @@ bool CompositorImpl::CompositeAndReadback(void *pixels, const gfx::Rect& rect) {
     return false;
 }
 
+cc::UIResourceId CompositorImpl::GenerateUIResource(
+    scoped_refptr<cc::UIResourceBitmap> bitmap) {
+  if (!host_)
+    return 0;
+  scoped_ptr<cc::ScopedUIResource> ui_resource =
+    cc::ScopedUIResource::Create(host_.get(), bitmap);
+  cc::UIResourceId id = ui_resource->id();
+  ui_resource_map_.insert(std::make_pair(id, ui_resource.release()));
+  return id;
+}
+
+void CompositorImpl::DeleteUIResource(cc::UIResourceId resource_id) {
+  UIResourceMap::iterator it = ui_resource_map_.find(resource_id);
+  if (it != ui_resource_map_.end())
+    ui_resource_map_.erase(it);
+}
+
 WebKit::WebGLId CompositorImpl::GenerateTexture(gfx::JavaBitmap& bitmap) {
   unsigned int texture_id = BuildBasicTexture();
   WebKit::WebGraphicsContext3D* context =