Update the nine patch layer to use UI resources

cc/resources/ui_resource_bitmap.h

 // Copyright 2013 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 CC_RESOURCES_UI_RESOURCE_BITMAP_H_
 #define CC_RESOURCES_UI_RESOURCE_BITMAP_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
+#include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkTypes.h"
 #include "ui/gfx/size.h"
 
+class SkBitmap;
+
 namespace cc {
 
 // Ref-counted bitmap class (can’t use SkBitmap because of ETC1).  Thread-safety
 // ensures that both main and impl threads can hold references to the bitmap and
 // that asynchronous uploads are allowed.
-class CC_EXPORT UIResourceBitmap
-    : public base::RefCountedThreadSafe<UIResourceBitmap> {
+class CC_EXPORT UIResourceBitmap {
  public:
   enum UIResourceFormat {
-    RGBA8
+    RGBA8,
+    INVALID_FORMAT
   };
 
-  // Takes ownership of “pixels”.
-  static scoped_refptr<UIResourceBitmap> Create(uint8_t* pixels,
-                                                UIResourceFormat format,
-                                                gfx::Size size);
-
   gfx::Size GetSize() const { return size_; }
   UIResourceFormat GetFormat() const { return format_; }
-  uint8_t* GetPixels() { return pixels_.get(); }
+  uint8_t* GetPixels() const;
+
+  explicit UIResourceBitmap(const SkBitmap& skbitmap);
+
+  UIResourceBitmap(const UIResourceBitmap& src);
+
+  UIResourceBitmap& operator=(const UIResourceBitmap& src);
+
+  explicit UIResourceBitmap();

[aelias_OOO_until_Jul13, 2013/09/06 04:17:38]

Can we get rid of this default constructor and the concept of "INVALID_FORMAT"? 
You'll just need to use a constructor to initialize UIResourceRequest instead of
initializing it by setting fields.

[powei, 2013/09/09 17:57:18]

Done.

+
+  ~UIResourceBitmap();
 
  private:
-  friend class base::RefCountedThreadSafe<UIResourceBitmap>;
+  void Create(const skia::RefPtr<SkPixelRef>& pixel_ref,
+              UIResourceFormat format,
+              gfx::Size size);
 
-  UIResourceBitmap();
-  ~UIResourceBitmap();
-
-  scoped_ptr<uint8_t[]> pixels_;
+  skia::RefPtr<SkPixelRef> pixel_ref_;
   UIResourceFormat format_;
   gfx::Size size_;
-
-  DISALLOW_COPY_AND_ASSIGN(UIResourceBitmap);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_UI_RESOURCE_BITMAP_H_