Update the nine patch layer to use UI resources

content/browser/renderer_host/compositor_impl_android.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "cc/resources/ui_resource_client.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/public/browser/android/compositor.h"
 
 struct ANativeWindow;
 
 namespace cc {
 class InputHandlerClient;
 class Layer;
 class LayerTreeHost;
+class ScopedUIResource;
 }
 
 namespace content {
 class CompositorClient;
 class GraphicsContext;
 
 // -----------------------------------------------------------------------------
 // Browser-side compositor that manages a tree of content and UI layers.
 // -----------------------------------------------------------------------------
 class CONTENT_EXPORT CompositorImpl
@@ skipping 19 matching lines @@
   virtual void SetWindowSurface(ANativeWindow* window) OVERRIDE;
   virtual void SetSurface(jobject surface) OVERRIDE;
   virtual void SetVisible(bool visible) OVERRIDE;
   virtual void setDeviceScaleFactor(float factor) OVERRIDE;
   virtual void SetWindowBounds(const gfx::Size& size) OVERRIDE;
   virtual void SetHasTransparentBackground(bool flag) OVERRIDE;
   virtual bool CompositeAndReadback(
       void *pixels, const gfx::Rect& rect) OVERRIDE;
   virtual void SetNeedsRedraw() OVERRIDE;
   virtual void Composite() OVERRIDE;
+  virtual cc::UIResourceId GenerateUIResource(
+      scoped_refptr<cc::UIResourceBitmap> bitmap) OVERRIDE;
+  virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;
   virtual WebKit::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE;
   virtual WebKit::WebGLId GenerateCompressedTexture(
       gfx::Size& size, int data_size, void* data) OVERRIDE;
   virtual void DeleteTexture(WebKit::WebGLId texture_id) OVERRIDE;
   virtual bool CopyTextureToBitmap(WebKit::WebGLId texture_id,
                                    gfx::JavaBitmap& bitmap) OVERRIDE;
   virtual bool CopyTextureToBitmap(WebKit::WebGLId texture_id,
                                    const gfx::Rect& sub_rect,
                                    gfx::JavaBitmap& bitmap) OVERRIDE;
 
@@ skipping 37 matching lines @@
   bool has_transparent_background_;
 
   ANativeWindow* window_;
   int surface_id_;
 
   CompositorClient* client_;
   base::WeakPtrFactory<CompositorImpl> weak_factory_;
 
   scoped_refptr<cc::ContextProvider> null_offscreen_context_provider_;
 
+  typedef base::hash_map<cc::UIResourceId, cc::ScopedUIResource*>

[danakj, 2013/08/27 15:42:48]

Can you use cc/base/scoped_ptr_hash_map for this? That'd give you more safety.

[powei, 2013/08/27 22:39:28]

Including scoped_ptr_hash_map violated a dep rule in content/DEPS.  There's a
comment that says to move scoped_ptr_hash_map to base.  Does anyone know if this
is safe to do?  Might have to start a new CL to do that.

[danakj, 2013/08/27 22:43:50]

Oh, clever DEPS rules. We should move it, just no one has. The hash map should
be perhaps the least controversial of them.

https://code.google.com/p/chromium/issues/detail?id=156199

+      UIResourceMap;
+  UIResourceMap ui_resource_map_;
+
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };
 
 } // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_