ui/android: Fix Resource meta-data sharing with ResourceManager.

chrome/browser/android/compositor/layer/tab_layer.cc

 // Copyright 2014 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 "chrome/browser/android/compositor/layer/tab_layer.h"
 
 #include "base/i18n/rtl.h"
 #include "base/memory/ptr_util.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_collections.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "chrome/browser/android/compositor/decoration_title.h"
 #include "chrome/browser/android/compositor/layer/content_layer.h"
 #include "chrome/browser/android/compositor/layer/toolbar_layer.h"
 #include "chrome/browser/android/compositor/layer_title_cache.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "content/public/browser/android/compositor.h"
+#include "ui/android/resources/nine_patch_resource.h"
 #include "ui/android/resources/resource_manager.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/geometry/insets_f.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/transform.h"
 
 namespace android {
@@ skipping 114 matching lines @@
                              float side_border_scale,
                              bool inset_border) {
   if (alpha <= 0) {
     layer_->SetHideLayerAndSubtree(true);
     return;
   }
 
   layer_->SetHideLayerAndSubtree(false);
 
   // Grab required resources
-  ui::ResourceManager::Resource* border_resource =
-      resource_manager_->GetStaticResourceWithTint(border_resource_id,
-                                                   toolbar_background_color);
-  ui::ResourceManager::Resource* border_inner_shadow_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                     border_inner_shadow_resource_id);
-  ui::ResourceManager::Resource* shadow_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                     shadow_resource_id);
-  ui::ResourceManager::Resource* contour_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                     contour_resource_id);
-  ui::ResourceManager::Resource* close_btn_resource =
+  ui::NinePatchResource* border_resource =
+      ui::NinePatchResource::From(resource_manager_->GetStaticResourceWithTint(
+          border_resource_id, toolbar_background_color));
+  ui::NinePatchResource* border_inner_shadow_resource =
+      ui::NinePatchResource::From(resource_manager_->GetResource(
+          ui::ANDROID_RESOURCE_TYPE_STATIC, border_inner_shadow_resource_id));
+  ui::NinePatchResource* shadow_resource =
+      ui::NinePatchResource::From(resource_manager_->GetResource(
+          ui::ANDROID_RESOURCE_TYPE_STATIC, shadow_resource_id));
+  ui::NinePatchResource* contour_resource =
+      ui::NinePatchResource::From(resource_manager_->GetResource(
+          ui::ANDROID_RESOURCE_TYPE_STATIC, contour_resource_id));
+  ui::Resource* close_btn_resource =
       resource_manager_->GetStaticResourceWithTint(close_button_resource_id,
                                                    close_button_color);
-  ui::ResourceManager::Resource* back_logo_resource = nullptr;
+  ui::Resource* back_logo_resource = nullptr;
 
   DecorationTitle* title_layer = nullptr;
 
   //----------------------------------------------------------------------------
   // Handle Border Scaling (Upscale/Downscale everything until final scaling)
   //----------------------------------------------------------------------------
   width /= border_scale;
   height /= border_scale;
   shadow_x /= border_scale;
   shadow_y /= border_scale;
   shadow_width /= border_scale;
   shadow_height /= border_scale;
 
   //----------------------------------------------------------------------------
   // Precalculate Helper Values
   //----------------------------------------------------------------------------
-  const gfx::RectF border_padding(border_resource->padding);
+  const gfx::RectF border_padding(border_resource->padding());
   const gfx::RectF border_inner_shadow_padding(
-      border_inner_shadow_resource->padding);
-  const gfx::RectF shadow_padding(shadow_resource->padding);
-  const gfx::RectF contour_padding(contour_resource->padding);
+      border_inner_shadow_resource->padding());
+  const gfx::RectF shadow_padding(shadow_resource->padding());
+  const gfx::RectF contour_padding(contour_resource->padding());
 
   // If we're in portrait and we're RTL, the close button is on the left.
   // Similarly if we're in landscape and we're in LTR, the close button is on
   // the left.
   const bool close_button_on_left = is_portrait == l10n_util::IsLayoutRtl();
   const bool back_visible = cos(rotation_x * SK_MScalarPI / 180.0f) < 0 ||
                             cos(rotation_y * SK_MScalarPI / 180.0f) < 0;
 
   const float content_scale = width / content_width;
   gfx::RectF content_area(0.f, 0.f, content_width, content_height);
   gfx::RectF scaled_local_content_area(shadow_x, shadow_y, shadow_width,
                                        shadow_height);
   gfx::RectF descaled_local_content_area(
       scaled_local_content_area.x() / content_scale,
       scaled_local_content_area.y() / content_scale,
       scaled_local_content_area.width() / content_scale,
       scaled_local_content_area.height() / content_scale);
 
   const gfx::Size shadow_padding_size(
-      shadow_resource->size.width() - shadow_padding.width(),
-      shadow_resource->size.height() - shadow_padding.height());
+      shadow_resource->size().width() - shadow_padding.width(),
+      shadow_resource->size().height() - shadow_padding.height());
   const gfx::Size border_padding_size(
-      border_resource->size.width() - border_padding.width(),
-      border_resource->size.height() - border_padding.height());
+      border_resource->size().width() - border_padding.width(),
+      border_resource->size().height() - border_padding.height());
   const gfx::Size border_inner_shadow_padding_size(
-      border_inner_shadow_resource->size.width()
-          - border_inner_shadow_padding.width(),
-      border_inner_shadow_resource->size.height()
-          - border_inner_shadow_padding.height());
+      border_inner_shadow_resource->size().width() -
+          border_inner_shadow_padding.width(),
+      border_inner_shadow_resource->size().height() -
+          border_inner_shadow_padding.height());
   const gfx::Size contour_padding_size(
-      contour_resource->size.width() - contour_padding.width(),
-      contour_resource->size.height() - contour_padding.height());
+      contour_resource->size().width() - contour_padding.width(),
+      contour_resource->size().height() - contour_padding.height());
 
   const float close_btn_effective_width = close_btn_width * close_alpha;
 
   //--------------------------------------------------------------------------
   // Update Resource Ids For Layers That Impact Layout
   //--------------------------------------------------------------------------
 
   // TODO(kkimlabs): Tab switcher doesn't show the progress bar.
   toolbar_layer_->PushResource(toolbar_resource_id,
                                toolbar_background_color,
@@ skipping 48 matching lines @@
       height + contour_padding_size.height());
   gfx::Size close_button_size(close_btn_width, border_padding.y());
   gfx::Size title_size(width - close_btn_effective_width, border_padding.y());
   gfx::Size back_logo_size;
   // TODO(clholgat): Figure out why the back logo is null sometimes.
   if (back_visible) {
     back_logo_resource =
         resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                        back_logo_resource_id);
     if (back_logo_resource)
-      back_logo_size = back_logo_resource->size;
+      back_logo_size = back_logo_resource->size();
   }
 
   // Store this size at a point as it might go negative during the inset
   // calculations.
   gfx::Point desired_content_size_pt(
       descaled_local_content_area.width(),
       descaled_local_content_area.height() - toolbar_impact_height);
 
   // Shrink the toolbar layer so we properly clip if it's offset.
   gfx::Size toolbar_size(
@@ skipping 28 matching lines @@
   title_position.set_y(-border_padding.y());
   if (!close_button_on_left)
     close_button_position.set_x(width - close_button_size.width());
   else
     title_position.set_x(close_btn_effective_width);
 
   //----------------------------------------------------------------------------
   // Center Specific Assets in the Rects
   //----------------------------------------------------------------------------
   close_button_position.Offset(
-      (close_button_size.width() - close_btn_resource->size.width()) / 2.f,
-      (close_button_size.height() - close_btn_resource->size.height()) / 2.f);
-  close_button_size.SetSize(close_btn_resource->size.width(),
-                            close_btn_resource->size.height());
+      (close_button_size.width() - close_btn_resource->size().width()) / 2.f,
+      (close_button_size.height() - close_btn_resource->size().height()) / 2.f);
+  close_button_size.SetSize(close_btn_resource->size().width(),
+                            close_btn_resource->size().height());
 
   //----------------------------------------------------------------------------
   // Handle Insetting the Top Border Component
   //----------------------------------------------------------------------------
   if (inset_border) {
     float inset_diff = inset_border ? border_padding.y() : 0.f;
     descaled_local_content_area.set_height(
         descaled_local_content_area.height() - inset_diff);
     scaled_local_content_area.set_height(scaled_local_content_area.height() -
                                          inset_diff * content_scale);
@@ skipping 51 matching lines @@
   close_button_position.Offset(0.5f, 0.5f);
   toolbar_position.Offset(0.5f, 0.5f);
 
   border_size.Enlarge(-1.f, -1.f);
   border_inner_shadow_size.Enlarge(-1.f, -1.f);
   shadow_size.Enlarge(-1.f, -1.f);
 
   //----------------------------------------------------------------------------
   // Update Resource Ids
   //----------------------------------------------------------------------------
-  shadow_->SetUIResourceId(shadow_resource->ui_resource->id());
+  shadow_->SetUIResourceId(shadow_resource->ui_resource()->id());
   shadow_->SetBorder(shadow_resource->Border(shadow_size));
-  shadow_->SetAperture(shadow_resource->aperture);
+  shadow_->SetAperture(shadow_resource->aperture());
 
-  contour_shadow_->SetUIResourceId(contour_resource->ui_resource->id());
+  contour_shadow_->SetUIResourceId(contour_resource->ui_resource()->id());
   contour_shadow_->SetBorder(contour_resource->Border(contour_size));
-  contour_shadow_->SetAperture(contour_resource->aperture);
+  contour_shadow_->SetAperture(contour_resource->aperture());
 
-  front_border_->SetUIResourceId(border_resource->ui_resource->id());
-  front_border_->SetAperture(border_resource->aperture);
+  front_border_->SetUIResourceId(border_resource->ui_resource()->id());
+  front_border_->SetAperture(border_resource->aperture());
   front_border_->SetBorder(border_resource->Border(
       border_size,
       gfx::InsetsF(1.f, side_border_scale, 1.f, side_border_scale)));
 
   front_border_inner_shadow_->SetUIResourceId(
-      border_inner_shadow_resource->ui_resource->id());
+      border_inner_shadow_resource->ui_resource()->id());
   front_border_inner_shadow_->SetAperture(
-      border_inner_shadow_resource->aperture);
+      border_inner_shadow_resource->aperture());
   front_border_inner_shadow_->SetBorder(border_inner_shadow_resource->Border(
       border_inner_shadow_size));
 
   side_padding_->SetBackgroundColor(back_visible ? back_logo_color
       : default_background_color);
   bottom_padding_->SetBackgroundColor(back_visible ? back_logo_color
       : default_background_color);
 
   if (title_visible && layer_title_cache_)
     title_layer = layer_title_cache_->GetTitleLayer(id);
   SetTitle(title_layer);
 
-  close_button_->SetUIResourceId(close_btn_resource->ui_resource->id());
+  close_button_->SetUIResourceId(close_btn_resource->ui_resource()->id());
 
   if (!back_visible) {
     gfx::Rect rounded_descaled_content_area(
         round(descaled_local_content_area.x()),
         round(descaled_local_content_area.y()),
         round(desired_content_size.width()),
         round(desired_content_size.height()));
 
     content_->SetProperties(id, can_use_live_layer, static_to_view_blend,
                             true, alpha, saturation,
                             true, rounded_descaled_content_area);
   } else if (back_logo_resource) {
-    back_logo_->SetUIResourceId(back_logo_resource->ui_resource->id());
+    back_logo_->SetUIResourceId(back_logo_resource->ui_resource()->id());
   }
 
   //----------------------------------------------------------------------------
   // Push Size, Position, Alpha and Transformations to Layers
   //----------------------------------------------------------------------------
   shadow_->SetHideLayerAndSubtree(!shadow_visible);
   if (shadow_visible) {
     shadow_->SetPosition(shadow_position);
     shadow_->SetBounds(shadow_size);
     shadow_->SetOpacity(shadow_alpha);
@@ skipping 211 matching lines @@
       title_->RemoveAllChildren();
       title_->AddChild(layer);
     }
   }
 
   if (title)
     title->SetUIResourceIds();
 }
 
 }  //  namespace android