Update the nine patch layer to use UI resources

cc/layers/nine_patch_layer_impl.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_impl.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "cc/layers/quad_sink.h"
 #include "cc/quads/texture_draw_quad.h"
+#include "cc/trees/layer_tree_impl.h"
 #include "ui/gfx/rect_f.h"
 
 namespace cc {
 
 NinePatchLayerImpl::NinePatchLayerImpl(LayerTreeImpl* tree_impl, int id)
     : LayerImpl(tree_impl, id),
-      resource_id_(0) {}
+      fill_center_(false),
+      ui_resource_id_(0) {}
 
 NinePatchLayerImpl::~NinePatchLayerImpl() {}
 
 ResourceProvider::ResourceId NinePatchLayerImpl::ContentsResourceId() const {
   return 0;
 }
 
 scoped_ptr<LayerImpl> NinePatchLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return NinePatchLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>();
 }
 
 void NinePatchLayerImpl::PushPropertiesTo(LayerImpl* layer) {
   LayerImpl::PushPropertiesTo(layer);
   NinePatchLayerImpl* layer_impl = static_cast<NinePatchLayerImpl*>(layer);
 
-  if (!resource_id_)
-    return;
-
-  layer_impl->SetResourceId(resource_id_);
-  layer_impl->SetLayout(image_bounds_, image_aperture_);
+  layer_impl->set_ui_resource_id(ui_resource_id_);
+  layer_impl->SetLayout(image_bounds_, image_aperture_, border_, fill_center_);
 }
 
 static gfx::RectF NormalizedRect(float x,
                                  float y,
                                  float width,
                                  float height,
                                  float total_width,
                                  float total_height) {
   return gfx::RectF(x / total_width,
                     y / total_height,
                     width / total_width,
                     height / total_height);
 }
 
-void NinePatchLayerImpl::SetLayout(gfx::Size image_bounds, gfx::Rect aperture) {
+void NinePatchLayerImpl::SetLayout(gfx::Size image_bounds, gfx::Rect aperture,
+    gfx::Rect border, bool fill_center) {

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

One argument per line, lining up with the ( unless you wrap right after the (.
Or just clang-format maybe?

[powei, 2013/08/27 19:04:57]

Done.

+  // |border| is in layer space.  It cannot exceed the bounds of the layer.
+  DCHECK_GE(bounds().width(), border.width());
+  DCHECK_GE(bounds().height(), border.height());
+
+  // |aperture| is in image space.  It cannot exceed the bounds of the bitmap.
+  DCHECK(gfx::Rect(image_bounds.width(), image_bounds.height())
+             .Contains(aperture));
+
   image_bounds_ = image_bounds;
   image_aperture_ = aperture;
+  border_ = border;
+  fill_center_ = fill_center;

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

Should this function also cause damage so it is redrawn on the screen?

[powei, 2013/08/27 19:04:57]

Done.

 }
 
 bool NinePatchLayerImpl::WillDraw(DrawMode draw_mode,
                                   ResourceProvider* resource_provider) {
-  if (!resource_id_ || draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE)
+  if (!ui_resource_id_ || draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE)
     return false;
   return LayerImpl::WillDraw(draw_mode, resource_provider);
 }
 
 void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink,
                                      AppendQuadsData* append_quads_data) {
+  if (!ui_resource_id_ || !layer_tree_impl())

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

layer_tree_impl is never null, it's set non-null in the layer's constructor and
never changed.

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

Done.

+    return;
+
+  ResourceProvider::ResourceId resource =
+      layer_tree_impl()->ResourceIdForUIResource(ui_resource_id_);
+
+  if (!resource)
+    return;
+
   SharedQuadState* shared_quad_state =
       quad_sink->UseSharedQuadState(CreateSharedQuadState());
   AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data);
 
-  if (!resource_id_)
-    return;
-
   static const bool flipped = false;
   static const bool premultiplied_alpha = true;
 
   DCHECK(!bounds().IsEmpty());
 
-  // NinePatch border widths in bitmap pixel space
-  int left_width = image_aperture_.x();
-  int top_height = image_aperture_.y();
-  int right_width = image_bounds_.width() - image_aperture_.right();
-  int bottom_height = image_bounds_.height() - image_aperture_.bottom();
+  // NinePatch border widths in layer space

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

nit: Period.

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

Done.

+  int left_width = border_.x();

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

maybe prefixing all these variables with layer_ or image_ would help a lot?

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

Done.

+  int top_height = border_.y();
+  int right_width = border_.width() - left_width;
+  int bottom_height = border_.height() - top_height;
 
   // If layer can't fit the corners, clip to show the outer edges of the
   // image.
   int corner_total_width = left_width + right_width;
   int middle_width = bounds().width() - corner_total_width;
   if (middle_width < 0) {
     float left_width_proportion =
         static_cast<float>(left_width) / corner_total_width;
     int left_width_crop = middle_width * left_width_proportion;
     left_width += left_width_crop;
@@ skipping 19 matching lines @@
       0, bounds().height() - bottom_height, left_width, bottom_height);
   gfx::Rect bottom_right(
       top_right.x(), bottom_left.y(), right_width, bottom_height);
   gfx::Rect top(top_left.right(), 0, middle_width, top_height);
   gfx::Rect left(0, top_left.bottom(), left_width, middle_height);
   gfx::Rect right(top_right.x(),
                   top_right.bottom(),
                   right_width,
                   left.height());
   gfx::Rect bottom(top.x(), bottom_left.y(), top.width(), bottom_height);
+  gfx::Rect center(left_width, top_height,
+                   middle_width,
+                   middle_height);
 
+  // Note the following values are in image (bitmap) space.
   float img_width = image_bounds_.width();
   float img_height = image_bounds_.height();
 
+  int img_aperture_left_width = image_aperture_.x();
+  int img_aperture_top_height = image_aperture_.y();
+  int img_aperture_right_width = img_width - image_aperture_.right();
+  int img_aperture_bottom_height = img_height - image_aperture_.bottom();
   // Patch positions in bitmap UV space (from zero to one)
   gfx::RectF uv_top_left = NormalizedRect(0,
                                           0,
-                                          left_width,
-                                          top_height,
+                                          img_aperture_left_width,
+                                          img_aperture_top_height,
                                           img_width,
                                           img_height);
-  gfx::RectF uv_top_right = NormalizedRect(img_width - right_width,
+  gfx::RectF uv_top_right = NormalizedRect(img_width - img_aperture_right_width,
                                            0,
-                                           right_width,
-                                           top_height,
+                                           img_aperture_right_width,
+                                           img_aperture_top_height,
                                            img_width,
                                            img_height);
-  gfx::RectF uv_bottom_left = NormalizedRect(0,
-                                             img_height - bottom_height,
-                                             left_width,
-                                             bottom_height,
-                                             img_width,
-                                             img_height);
-  gfx::RectF uv_bottom_right = NormalizedRect(img_width - right_width,
-                                              img_height - bottom_height,
-                                              right_width,
-                                              bottom_height,
-                                              img_width,
-                                              img_height);
-  gfx::RectF uv_top(uv_top_left.right(),
-                   0,
-                   (img_width - left_width - right_width) / img_width,
-                   (top_height) / img_height);
-  gfx::RectF uv_left(0,
-                    uv_top_left.bottom(),
-                    left_width / img_width,
-                    (img_height - top_height - bottom_height) / img_height);
+  gfx::RectF uv_bottom_left =
+      NormalizedRect(0,
+                     img_height - img_aperture_bottom_height,
+                     img_aperture_left_width,
+                     img_aperture_bottom_height,
+                     img_width,
+                     img_height);
+  gfx::RectF uv_bottom_right =
+      NormalizedRect(img_width - img_aperture_right_width,
+                     img_height - img_aperture_bottom_height,
+                     img_aperture_right_width,
+                     img_aperture_bottom_height,
+                     img_width,
+                     img_height);
+  gfx::RectF uv_top(
+      uv_top_left.right(),
+      0,
+      (img_width - img_aperture_left_width - img_aperture_right_width) /
+          img_width,
+      (img_aperture_top_height) / img_height);
+  gfx::RectF uv_left(
+      0,
+      uv_top_left.bottom(),
+      img_aperture_left_width / img_width,
+      (img_height - img_aperture_top_height - img_aperture_bottom_height) /
+          img_height);
   gfx::RectF uv_right(uv_top_right.x(),
-                     uv_top_right.bottom(),
-                     right_width / img_width,
-                     uv_left.height());
+                      uv_top_right.bottom(),
+                      img_aperture_right_width / img_width,
+                      uv_left.height());
   gfx::RectF uv_bottom(uv_top.x(),
                       uv_bottom_left.y(),
                       uv_top.width(),
-                      bottom_height / img_height);
+                      img_aperture_bottom_height / img_height);
+  gfx::RectF uv_center(uv_top_left.right(),
+                       uv_top_left.bottom(),
+                       uv_top.width(),
+                       uv_left.height());
 
   // Nothing is opaque here.
   // TODO(danakj): Should we look at the SkBitmaps to determine opaqueness?
   gfx::Rect opaque_rect;
   const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
   scoped_ptr<TextureDrawQuad> quad;
 
   quad = TextureDrawQuad::Create();
   quad->SetNew(shared_quad_state,
                top_left,
                opaque_rect,
-               resource_id_,
+               resource,
                premultiplied_alpha,
                uv_top_left.origin(),
                uv_top_left.bottom_right(),
                SK_ColorTRANSPARENT,
                vertex_opacity,
                flipped);
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 
   quad = TextureDrawQuad::Create();
   quad->SetNew(shared_quad_state,
                top_right,
                opaque_rect,
-               resource_id_,
+               resource,
                premultiplied_alpha,
                uv_top_right.origin(),
                uv_top_right.bottom_right(),
                SK_ColorTRANSPARENT,
                vertex_opacity,
                flipped);
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 
   quad = TextureDrawQuad::Create();
   quad->SetNew(shared_quad_state,
                bottom_left,
                opaque_rect,
-               resource_id_,
+               resource,
                premultiplied_alpha,
                uv_bottom_left.origin(),
                uv_bottom_left.bottom_right(),
                SK_ColorTRANSPARENT,
                vertex_opacity,
                flipped);
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 
   quad = TextureDrawQuad::Create();
   quad->SetNew(shared_quad_state,
                bottom_right,
                opaque_rect,
-               resource_id_,
+               resource,
                premultiplied_alpha,
                uv_bottom_right.origin(),
                uv_bottom_right.bottom_right(),
                SK_ColorTRANSPARENT,
                vertex_opacity,
                flipped);
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 
   quad = TextureDrawQuad::Create();
   quad->SetNew(shared_quad_state,
                top,
                opaque_rect,
-               resource_id_,
+               resource,
                premultiplied_alpha,
                uv_top.origin(),
                uv_top.bottom_right(),
                SK_ColorTRANSPARENT,
                vertex_opacity,
                flipped);
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 
   quad = TextureDrawQuad::Create();
   quad->SetNew(shared_quad_state,
                left,
                opaque_rect,
-               resource_id_,
+               resource,
                premultiplied_alpha,
                uv_left.origin(),
                uv_left.bottom_right(),
                SK_ColorTRANSPARENT,
                vertex_opacity,
                flipped);
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 
   quad = TextureDrawQuad::Create();
   quad->SetNew(shared_quad_state,
                right,
                opaque_rect,
-               resource_id_,
+               resource,
                premultiplied_alpha,
                uv_right.origin(),
                uv_right.bottom_right(),
                SK_ColorTRANSPARENT,
                vertex_opacity,
                flipped);
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
 
   quad = TextureDrawQuad::Create();
   quad->SetNew(shared_quad_state,
                bottom,
                opaque_rect,
-               resource_id_,
+               resource,
                premultiplied_alpha,
                uv_bottom.origin(),
                uv_bottom.bottom_right(),
                SK_ColorTRANSPARENT,
                vertex_opacity,
                flipped);
   quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
-}
 
-void NinePatchLayerImpl::DidLoseOutputSurface() {
-  resource_id_ = 0;
+  if (fill_center_) {
+    quad = TextureDrawQuad::Create();
+    quad->SetNew(shared_quad_state,
+                 center,
+                 opaque_rect,
+                 resource,
+                 premultiplied_alpha,
+                 uv_center.origin(),
+                 uv_center.bottom_right(),
+                 SK_ColorTRANSPARENT,
+                 vertex_opacity,
+                 flipped);
+    quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
+  }
 }
 
 const char* NinePatchLayerImpl::LayerTypeAsString() const {
   return "cc::NinePatchLayerImpl";
 }
 
 base::DictionaryValue* NinePatchLayerImpl::LayerTreeAsJson() const {
   base::DictionaryValue* result = LayerImpl::LayerTreeAsJson();
 
   base::ListValue* list = new base::ListValue;
   list->AppendInteger(image_aperture_.origin().x());
   list->AppendInteger(image_aperture_.origin().y());
   list->AppendInteger(image_aperture_.size().width());
   list->AppendInteger(image_aperture_.size().height());
   result->Set("ImageAperture", list);
 
   list = new base::ListValue;
   list->AppendInteger(image_bounds_.width());
   list->AppendInteger(image_bounds_.height());
   result->Set("ImageBounds", list);
 
+  list = new base::ListValue;
+  list->AppendInteger(border_.width());

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

Border is a rect, why not save it all? Also we have MathUtil::AsValue for
various geometry things.

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

Done.

+  list->AppendInteger(border_.height());
+  result->Set("Border", list);
+
+  base::FundamentalValue* fill_center =
+      base::Value::CreateBooleanValue(fill_center_);
+  result->Set("FillCenter", fill_center);
+
   return result;
 }
 
 }  // namespace cc