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

chrome/browser/android/compositor/layer/contextual_search_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/contextual_search_layer.h"
 
 #include "cc/layers/layer.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/layer/crushed_sprite_layer.h"
 #include "content/public/browser/android/compositor.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/crushed_sprite_resource.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/color_utils.h"
 
 namespace {
 
 const SkColor kSearchBackgroundColor = SkColorSetRGB(0xee, 0xee, 0xee);
 const SkColor kSearchBarBackgroundColor = SkColorSetRGB(0xff, 0xff, 0xff);
 const SkColor kPeekPromoRippleBackgroundColor = SkColorSetRGB(0x42, 0x85, 0xF4);
 const SkColor kTouchHighlightColor = SkColorSetARGB(0x33, 0x99, 0x99, 0x99);
@@ skipping 117 matching lines @@
       search_bar_shadow_opacity,
       close_icon_opacity);
 
   bool is_rtl = l10n_util::IsLayoutRtl();
 
   // ---------------------------------------------------------------------------
   // Peek Promo
   // ---------------------------------------------------------------------------
   if (search_peek_promo_visible) {
     // Grabs the Search Opt Out Promo resource.
-    ui::ResourceManager::Resource* peek_promo_text_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
-                                       peek_promo_text_resource_id);
+    ui::Resource* peek_promo_text_resource = resource_manager_->GetResource(
+        ui::ANDROID_RESOURCE_TYPE_DYNAMIC, peek_promo_text_resource_id);
 
-    ui::ResourceManager::Resource* peek_promo_ripple_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                       peek_promo_ripple_resource_id);
+    ui::NinePatchResource* peek_promo_ripple_resource =
+        ui::NinePatchResource::From(resource_manager_->GetResource(
+            ui::ANDROID_RESOURCE_TYPE_STATIC, peek_promo_ripple_resource_id));
 
     // -----------------------------------------------------------------
     // Peek Promo Container
     // -----------------------------------------------------------------
     if (peek_promo_container_->parent() != layer_) {
       layer_->AddChild(peek_promo_container_);
     }
 
     gfx::Size peek_promo_size(search_panel_width, search_peek_promo_height);
     peek_promo_container_->SetBounds(peek_promo_size);
@@ skipping 25 matching lines @@
 
     float ripple_rotation = 0.f;
     float ripple_left = 0.f;
     if (is_rtl) {
       // Rotate the ripple 180 degrees to make it point to the left side.
       ripple_rotation = 180.f;
       ripple_left = search_panel_width - peek_promo_ripple_size.width();
     }
 
     peek_promo_ripple_->SetUIResourceId(
-        peek_promo_ripple_resource->ui_resource->id());
+        peek_promo_ripple_resource->ui_resource()->id());
     peek_promo_ripple_->SetBorder(peek_promo_ripple_border);
-    peek_promo_ripple_->SetAperture(peek_promo_ripple_resource->aperture);
+    peek_promo_ripple_->SetAperture(peek_promo_ripple_resource->aperture());
     peek_promo_ripple_->SetBounds(peek_promo_ripple_size);
     peek_promo_ripple_->SetPosition(gfx::PointF(ripple_left, 0.f));
     peek_promo_ripple_->SetOpacity(search_peek_promo_ripple_opacity);
 
     if (ripple_rotation != 0.f) {
       // Apply rotation about the center of the resource.
       float pivot_x = floor(peek_promo_ripple_size.width() / 2);
       float pivot_y = floor(peek_promo_ripple_size.height() / 2);
       gfx::PointF pivot_origin(pivot_x, pivot_y);
       gfx::Transform transform;
       transform.Translate(pivot_origin.x(), pivot_origin.y());
       transform.RotateAboutZAxis(ripple_rotation);
       transform.Translate(-pivot_origin.x(), -pivot_origin.y());
       peek_promo_ripple_->SetTransform(transform);
     }
 
     // -----------------------------------------------------------------
     // Peek Promo Text
     // -----------------------------------------------------------------
     if (peek_promo_text_resource) {
       peek_promo_text_->SetUIResourceId(
-          peek_promo_text_resource->ui_resource->id());
-      peek_promo_text_->SetBounds(peek_promo_text_resource->size);
+          peek_promo_text_resource->ui_resource()->id());
+      peek_promo_text_->SetBounds(peek_promo_text_resource->size());
       peek_promo_text_->SetPosition(
           gfx::PointF(0.f, search_peek_promo_padding));
       peek_promo_text_->SetOpacity(search_peek_promo_text_opacity);
     }
   } else {
     // Peek Promo Container
     if (peek_promo_container_.get() && peek_promo_container_->parent())
       peek_promo_container_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
   // Search Term, Context and Search Caption
   // ---------------------------------------------------------------------------
   SetupTextLayer(
       search_bar_top,
       search_bar_height,
       search_text_layer_min_height,
       search_caption_resource_id,
       search_caption_visible,
       search_caption_animation_percentage,
       search_term_opacity,
       search_context_resource_id,
       search_context_opacity,
       search_term_caption_spacing);
 
   // ---------------------------------------------------------------------------
   // Arrow Icon
   // ---------------------------------------------------------------------------
   // Grabs the arrow icon resource.
-  ui::ResourceManager::Resource* arrow_icon_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                     arrow_up_resource_id);
+  ui::Resource* arrow_icon_resource = resource_manager_->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, arrow_up_resource_id);
 
   // Positions the icon at the end of the bar.
   float arrow_icon_left;
   if (is_rtl) {
     arrow_icon_left = search_bar_margin_side;
   } else {
-    arrow_icon_left = search_panel_width - arrow_icon_resource->size.width()
-        - search_bar_margin_side;
+    arrow_icon_left = search_panel_width - arrow_icon_resource->size().width() -
+                      search_bar_margin_side;
   }
 
   // Centers the Arrow Icon vertically in the bar.
   float arrow_icon_top = search_bar_top + search_bar_height / 2 -
-      arrow_icon_resource->size.height() / 2;
+                         arrow_icon_resource->size().height() / 2;
 
-  arrow_icon_->SetUIResourceId(arrow_icon_resource->ui_resource->id());
-  arrow_icon_->SetBounds(arrow_icon_resource->size);
+  arrow_icon_->SetUIResourceId(arrow_icon_resource->ui_resource()->id());
+  arrow_icon_->SetBounds(arrow_icon_resource->size());
   arrow_icon_->SetPosition(
       gfx::PointF(arrow_icon_left, arrow_icon_top));
   arrow_icon_->SetOpacity(arrow_icon_opacity);
 
   gfx::Transform transform;
   if (arrow_icon_rotation != 0.f) {
     // Apply rotation about the center of the icon.
-    float pivot_x = floor(arrow_icon_resource->size.width() / 2);
-    float pivot_y = floor(arrow_icon_resource->size.height() / 2);
+    float pivot_x = floor(arrow_icon_resource->size().width() / 2);
+    float pivot_y = floor(arrow_icon_resource->size().height() / 2);
     gfx::PointF pivot_origin(pivot_x, pivot_y);
     transform.Translate(pivot_origin.x(), pivot_origin.y());
     transform.RotateAboutZAxis(arrow_icon_rotation);
     transform.Translate(-pivot_origin.x(), -pivot_origin.y());
   }
   arrow_icon_->SetTransform(transform);
 
   // ---------------------------------------------------------------------------
   // Search Promo
   // ---------------------------------------------------------------------------
   if (search_promo_visible) {
     // Grabs the Search Opt Out Promo resource.
-    ui::ResourceManager::Resource* search_promo_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
-                                       search_promo_resource_id);
+    ui::Resource* search_promo_resource = resource_manager_->GetResource(
+        ui::ANDROID_RESOURCE_TYPE_DYNAMIC, search_promo_resource_id);
     // Search Promo Container
     if (search_promo_container_->parent() != layer_) {
       // NOTE(pedrosimonetti): The Promo layer should be always placed before
       // Search Bar Shadow to make sure it won't occlude the shadow.
       layer_->InsertChild(search_promo_container_, 0);
     }
 
     if (search_promo_resource) {
-      int search_promo_content_height = search_promo_resource->size.height();
+      int search_promo_content_height = search_promo_resource->size().height();
       gfx::Size search_promo_size(search_panel_width, search_promo_height);
       search_promo_container_->SetBounds(search_promo_size);
       search_promo_container_->SetPosition(gfx::PointF(0.f, search_bar_bottom));
       search_promo_container_->SetMasksToBounds(true);
 
       // Search Promo
       if (search_promo_->parent() != search_promo_container_)
         search_promo_container_->AddChild(search_promo_);
 
-      search_promo_->SetUIResourceId(search_promo_resource->ui_resource->id());
-      search_promo_->SetBounds(search_promo_resource->size);
+      search_promo_->SetUIResourceId(
+          search_promo_resource->ui_resource()->id());
+      search_promo_->SetBounds(search_promo_resource->size());
       // Align promo at the bottom of the container so the confirmation button
       // is is not clipped when resizing the promo.
       search_promo_->SetPosition(
           gfx::PointF(0.f, search_promo_height - search_promo_content_height));
       search_promo_->SetOpacity(search_promo_opacity);
     }
   } else {
     // Search Promo Container
     if (search_promo_container_.get() && search_promo_container_->parent())
       search_promo_container_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
   // Progress Bar
   // ---------------------------------------------------------------------------
   if (should_render_progress_bar) {
     // Grabs Progress Bar resources.
-    ui::ResourceManager::Resource* progress_bar_background_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                       progress_bar_background_resource_id);
-    ui::ResourceManager::Resource* progress_bar_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                       progress_bar_resource_id);
+    ui::NinePatchResource* progress_bar_background_resource =
+        ui::NinePatchResource::From(resource_manager_->GetResource(
+            ui::ANDROID_RESOURCE_TYPE_STATIC,
+            progress_bar_background_resource_id));
+    ui::NinePatchResource* progress_bar_resource =
+        ui::NinePatchResource::From(resource_manager_->GetResource(
+            ui::ANDROID_RESOURCE_TYPE_STATIC, progress_bar_resource_id));
 
     DCHECK(progress_bar_background_resource);
     DCHECK(progress_bar_resource);
 
     // Progress Bar Background
     if (progress_bar_background_->parent() != layer_)
       layer_->AddChild(progress_bar_background_);
 
     float progress_bar_y = search_bar_bottom - progress_bar_height;
     gfx::Size progress_bar_background_size(search_panel_width,
                                            progress_bar_height);
 
     progress_bar_background_->SetUIResourceId(
-        progress_bar_background_resource->ui_resource->id());
+        progress_bar_background_resource->ui_resource()->id());
     progress_bar_background_->SetBorder(
         progress_bar_background_resource->Border(progress_bar_background_size));
     progress_bar_background_->SetAperture(
-        progress_bar_background_resource->aperture);
+        progress_bar_background_resource->aperture());
     progress_bar_background_->SetBounds(progress_bar_background_size);
     progress_bar_background_->SetPosition(gfx::PointF(0.f, progress_bar_y));
     progress_bar_background_->SetOpacity(progress_bar_opacity);
 
     // Progress Bar
     if (progress_bar_->parent() != layer_)
       layer_->AddChild(progress_bar_);
 
     float progress_bar_width =
         floor(search_panel_width * progress_bar_completion / 100.f);
     gfx::Size progress_bar_size(progress_bar_width, progress_bar_height);
-    progress_bar_->SetUIResourceId(progress_bar_resource->ui_resource->id());
+    progress_bar_->SetUIResourceId(progress_bar_resource->ui_resource()->id());
     progress_bar_->SetBorder(progress_bar_resource->Border(progress_bar_size));
-    progress_bar_->SetAperture(progress_bar_resource->aperture);
+    progress_bar_->SetAperture(progress_bar_resource->aperture());
     progress_bar_->SetBounds(progress_bar_size);
     progress_bar_->SetPosition(gfx::PointF(0.f, progress_bar_y));
     progress_bar_->SetOpacity(progress_bar_opacity);
   } else {
     // Removes Progress Bar and its Background from the Layer Tree.
     if (progress_bar_background_.get() && progress_bar_background_->parent())
       progress_bar_background_->RemoveFromParent();
 
     if (progress_bar_.get() && progress_bar_->parent())
       progress_bar_->RemoveFromParent();
@@ skipping 64 matching lines @@
     float static_image_visibility_percentage) {
   icon_layer_->SetBounds(gfx::Size(static_image_size_, static_image_size_));
   icon_layer_->SetMasksToBounds(true);
 
   scoped_refptr<cc::UIResourceLayer> static_image_layer;
 
   if (quick_action_icon_visible) {
     if (quick_action_icon_layer_->parent() != icon_layer_)
       icon_layer_->AddChild(quick_action_icon_layer_);
 
-    ui::ResourceManager::Resource* quick_action_icon_resource =
-        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
-                                       quick_action_icon_resource_id);
+    ui::Resource* quick_action_icon_resource = resource_manager_->GetResource(
+        ui::ANDROID_RESOURCE_TYPE_DYNAMIC, quick_action_icon_resource_id);
     if (quick_action_icon_resource) {
       quick_action_icon_layer_->SetUIResourceId(
-          quick_action_icon_resource->ui_resource->id());
+          quick_action_icon_resource->ui_resource()->id());
       quick_action_icon_layer_->SetBounds(gfx::Size(static_image_size_,
                                                     static_image_size_));
 
       SetStaticImageProperties(quick_action_icon_layer_, 0, 0,
                                static_image_visibility_percentage);
     }
   } else if (quick_action_icon_layer_->parent()) {
     quick_action_icon_layer_->RemoveFromParent();
   }
 
@@ skipping 68 matching lines @@
                                            float term_caption_spacing) {
   // ---------------------------------------------------------------------------
   // Setup the Drawing Hierarchy
   // ---------------------------------------------------------------------------
   // Search Term
   bool bar_text_visible = search_term_opacity > 0.0f;
   if (bar_text_visible && bar_text_->parent() != text_layer_)
     text_layer_->AddChild(bar_text_);
 
   // Search Context
-  ui::ResourceManager::Resource* context_resource =
-      resource_manager_->GetResource(
-          ui::ANDROID_RESOURCE_TYPE_DYNAMIC, context_resource_id);
+  ui::Resource* context_resource = resource_manager_->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_DYNAMIC, context_resource_id);
   if (context_resource) {
-    search_context_->SetUIResourceId(context_resource->ui_resource->id());
-    search_context_->SetBounds(context_resource->size);
+    search_context_->SetUIResourceId(context_resource->ui_resource()->id());
+    search_context_->SetBounds(context_resource->size());
   }
 
   // Search Caption
-  ui::ResourceManager::Resource* caption_resource = nullptr;
+  ui::Resource* caption_resource = nullptr;
   if (caption_visible) {
     // Grabs the dynamic Search Caption resource so we can get a snapshot.
     caption_resource  = resource_manager_->GetResource(
         ui::ANDROID_RESOURCE_TYPE_DYNAMIC, caption_resource_id);
   }
 
   if (caption_visible && animation_percentage != 0.f) {
     if (search_caption_->parent() != text_layer_) {
       text_layer_->AddChild(search_caption_);
     }
     if (caption_resource) {
-      search_caption_->SetUIResourceId(caption_resource->ui_resource->id());
-      search_caption_->SetBounds(caption_resource->size);
+      search_caption_->SetUIResourceId(caption_resource->ui_resource()->id());
+      search_caption_->SetBounds(caption_resource->size());
     }
   } else if (search_caption_->parent()) {
     search_caption_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
   // Calculate Text Layer Size
   // ---------------------------------------------------------------------------
   // If space allows, the Term, Context and Caption should occupy a Text
   // section of fixed size.
@@ skipping 229 matching lines @@
 
   // Touch Highlight Layer
   touch_highlight_layer_->SetIsDrawable(true);
   touch_highlight_layer_->SetBackgroundColor(kTouchHighlightColor);
 }
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 }  //  namespace android