Update the nine patch layer to use UI resources

cc/layers/nine_patch_layer.cc

 // Copyright 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.
 
 #include "cc/layers/nine_patch_layer.h"
 
 #include "cc/layers/nine_patch_layer_impl.h"
 #include "cc/resources/prioritized_resource.h"
 #include "cc/resources/resource_update.h"
 #include "cc/resources/resource_update_queue.h"
+#include "cc/resources/scoped_ui_resource.h"
+#include "cc/resources/ui_resource_bitmap.h"
 #include "cc/trees/layer_tree_host.h"
 
+namespace {
+
+class ScopedUIResourceHolder : public cc::NinePatchLayer::UIResourceHolder {

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

I'm pretty sure you can put the namespace {} inside the namespace cc {} and then
you can avoid all these cc:: boilerplate.

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

Done.

+ public:
+  static scoped_ptr<ScopedUIResourceHolder> Create(cc::LayerTreeHost* host,
+                                            const SkBitmap& skbitmap) {
+    return make_scoped_ptr(new ScopedUIResourceHolder(host, skbitmap));
+  }
+  cc::UIResourceId id() OVERRIDE { return resource_->id(); }
+
+ private:
+  ScopedUIResourceHolder(cc::LayerTreeHost* host, const SkBitmap& skbitmap) {
+    resource_ = cc::ScopedUIResource::Create(
+        host, cc::UIResourceBitmap::CreateFromSkBitmap(skbitmap));
+  }
+
+  scoped_ptr<cc::ScopedUIResource> resource_;
+};
+
+class SharedUIResourceHolder : public cc::NinePatchLayer::UIResourceHolder {
+ public:
+  static scoped_ptr<SharedUIResourceHolder> Create(cc::UIResourceId id) {
+    return make_scoped_ptr(new SharedUIResourceHolder(id));
+  }
+
+  cc::UIResourceId id() OVERRIDE { return id_; }
+
+ private:
+  explicit SharedUIResourceHolder(cc::UIResourceId id) : id_(id) {}
+
+  cc::UIResourceId id_;
+};
+
+}  // anonymous namespace
+
 namespace cc {
 
+NinePatchLayer::UIResourceHolder::~UIResourceHolder() {}
+
 scoped_refptr<NinePatchLayer> NinePatchLayer::Create() {
   return make_scoped_refptr(new NinePatchLayer());
 }
 
-NinePatchLayer::NinePatchLayer()
-    : bitmap_dirty_(false) {}
+NinePatchLayer::NinePatchLayer() : fill_center_(true) {}

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

Should this default to false?  You're setting it to false in SetBitmap.

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

Done.

 
 NinePatchLayer::~NinePatchLayer() {}
 
 scoped_ptr<LayerImpl> NinePatchLayer::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return NinePatchLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
 }
 
-void NinePatchLayer::SetTexturePriorities(
-    const PriorityCalculator& priority_calc) {
-  if (resource_ && !resource_->texture()->resource_manager()) {
-    // Release the resource here, as it is no longer tied to a resource manager.
+void NinePatchLayer::SetLayerTreeHost(LayerTreeHost* host) {
+  // When the LTH is set to null or has changed, then this layer should remove
+  // all of its associated resources.
+  if (!host || host != layer_tree_host())
     resource_.reset();
-    if (!bitmap_.isNull())
-      CreateResource();
-  } else if (bitmap_dirty_ && DrawsContent()) {
-    CreateResource();
+
+  Layer::SetLayerTreeHost(host);
+}
+
+void NinePatchLayer::SetBorder(gfx::Rect border) {
+  if (border == border_)
+    return;
+  border_ = border;
+  SetNeedsCommit();
+}
+
+void NinePatchLayer::SetBitmap(const SkBitmap& skbitmap, gfx::Rect aperture) {
+  if (!layer_tree_host())
+    return;
+  image_aperture_ = aperture;
+  fill_center_ = false;
+  resource_ = ScopedUIResourceHolder::Create(layer_tree_host(), skbitmap);
+
+  SetNeedsPushProperties();
+  SetNeedsCommit();
+}
+
+void NinePatchLayer::SetUIResourceId(UIResourceId resource_id,
+                                     gfx::Rect aperture,
+                                     bool fill_center) {
+  if (resource_ && resource_->id() == resource_id &&
+      image_aperture_ == aperture && fill_center == fill_center_)
+    return;
+
+  image_aperture_ = aperture;
+  fill_center_ = fill_center;
+  if (resource_id) {
+    resource_ = SharedUIResourceHolder::Create(resource_id);
+  } else {
+    resource_.reset();
   }
 
-  if (resource_) {
-    resource_->texture()->set_request_priority(
-        PriorityCalculator::UIPriority(true));
-    GLenum texture_format =
-        layer_tree_host()->GetRendererCapabilities().best_texture_format;
-    resource_->texture()->SetDimensions(
-        gfx::Size(bitmap_.width(), bitmap_.height()), texture_format);
-  }
-}
-
-void NinePatchLayer::SetBitmap(const SkBitmap& bitmap, gfx::Rect aperture) {
-  bitmap_ = bitmap;
-  image_aperture_ = aperture;
-  bitmap_dirty_ = true;
-  SetNeedsDisplay();
-}
-
-bool NinePatchLayer::Update(ResourceUpdateQueue* queue,
-                            const OcclusionTracker* occlusion) {
-  bool updated = Layer::Update(queue, occlusion);
-
-  CreateUpdaterIfNeeded();
-
-  if (resource_ &&
-      (bitmap_dirty_ || resource_->texture()->resource_id() == 0)) {
-    gfx::Rect content_rect(0, 0, bitmap_.width(), bitmap_.height());
-    ResourceUpdate upload = ResourceUpdate::Create(resource_->texture(),
-                                                   &bitmap_,
-                                                   content_rect,
-                                                   content_rect,
-                                                   gfx::Vector2d());
-    queue->AppendFullUpload(upload);
-    bitmap_dirty_ = false;
-    updated = true;
-  }
-
-  return updated;
-}
-
-void NinePatchLayer::CreateUpdaterIfNeeded() {
-  if (updater_.get())
-    return;
-
-  updater_ = ImageLayerUpdater::Create();
-}
-
-void NinePatchLayer::CreateResource() {
-  DCHECK(!bitmap_.isNull());
-  CreateUpdaterIfNeeded();
-  updater_->SetBitmap(bitmap_);
-
-  if (!resource_) {
-    resource_ = updater_->CreateResource(
-        layer_tree_host()->contents_texture_manager());
-  }
+  SetNeedsPushProperties();
+  SetNeedsCommit();
 }
 
 bool NinePatchLayer::DrawsContent() const {
-  bool draws = !bitmap_.isNull() &&
-               Layer::DrawsContent() &&
-               bitmap_.width() &&
-               bitmap_.height();
-  return draws;
+  return resource_ && resource_->id() && Layer::DrawsContent();
 }
 
 void NinePatchLayer::PushPropertiesTo(LayerImpl* layer) {
   Layer::PushPropertiesTo(layer);
   NinePatchLayerImpl* layer_impl = static_cast<NinePatchLayerImpl*>(layer);
 
-  if (resource_) {
-    DCHECK(!bitmap_.isNull());
-    layer_impl->SetResourceId(resource_->texture()->resource_id());
-    layer_impl->SetLayout(
-        gfx::Size(bitmap_.width(), bitmap_.height()), image_aperture_);
+  if (!resource_) {
+    layer_impl->SetUIResourceId(0);
+  } else {
+    DCHECK(layer_tree_host());
+
+    gfx::Size image_size =
+        layer_tree_host()->GetUIResourceSize(resource_->id());
+    layer_impl->SetUIResourceId(resource_->id());
+    layer_impl->SetLayout(image_size, image_aperture_, border_, fill_center_);
   }
-
-  // NinePatchLayer must push properties every commit to make sure
-  // NinePatchLayerImpl::resource_id_ is valid.
-  // http://crbug.com/276482
-  needs_push_properties_ = true;
 }
 
 }  // namespace cc