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

chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.cc

 // Copyright 2015 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/scene_layer/tab_strip_scene_layer.h"
 
 #include "base/android/jni_android.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "chrome/browser/android/compositor/layer/tab_handle_layer.h"
 #include "chrome/browser/android/compositor/layer_title_cache.h"
 #include "content/public/browser/android/compositor.h"
 #include "jni/TabStripSceneLayer_jni.h"
+#include "ui/android/resources/nine_patch_resource.h"
 #include "ui/android/resources/resource_manager_impl.h"
 #include "ui/gfx/transform.h"
 
 using base::android::JavaParamRef;
 
 namespace android {
 
 TabStripSceneLayer::TabStripSceneLayer(JNIEnv* env, jobject jobj)
     : SceneLayer(env, jobj),
       tab_strip_layer_(cc::SolidColorLayer::Create()),
@@ skipping 117 matching lines @@
     const JavaParamRef<jobject>& jobj,
     jint resource_id,
     jfloat x,
     jfloat y,
     jfloat width,
     jfloat height,
     jboolean visible,
     const JavaParamRef<jobject>& jresource_manager) {
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
-  ui::ResourceManager::Resource* button_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    resource_id);
+  ui::Resource* button_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
 
-  new_tab_button_->SetUIResourceId(button_resource->ui_resource->id());
-  float left_offset = (width - button_resource->size.width()) / 2;
-  float top_offset = (height - button_resource->size.height()) / 2;
+  new_tab_button_->SetUIResourceId(button_resource->ui_resource()->id());
+  float left_offset = (width - button_resource->size().width()) / 2;
+  float top_offset = (height - button_resource->size().height()) / 2;
   new_tab_button_->SetPosition(gfx::PointF(x + left_offset, y + top_offset));
-  new_tab_button_->SetBounds(button_resource->size);
+  new_tab_button_->SetBounds(button_resource->size());
   new_tab_button_->SetHideLayerAndSubtree(!visible);
 }
 
 void TabStripSceneLayer::UpdateModelSelectorButton(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj,
     jint resource_id,
     jfloat x,
     jfloat y,
     jfloat width,
     jfloat height,
     jboolean incognito,
     jboolean visible,
     const JavaParamRef<jobject>& jresource_manager) {
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
-  ui::ResourceManager::Resource* button_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    resource_id);
+  ui::Resource* button_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
 
-  model_selector_button_->SetUIResourceId(button_resource->ui_resource->id());
-  float left_offset = (width - button_resource->size.width()) / 2;
-  float top_offset = (height - button_resource->size.height()) / 2;
+  model_selector_button_->SetUIResourceId(button_resource->ui_resource()->id());
+  float left_offset = (width - button_resource->size().width()) / 2;
+  float top_offset = (height - button_resource->size().height()) / 2;
   model_selector_button_->SetPosition(
       gfx::PointF(x + left_offset, y + top_offset));
-  model_selector_button_->SetBounds(button_resource->size);
+  model_selector_button_->SetBounds(button_resource->size());
   model_selector_button_->SetHideLayerAndSubtree(!visible);
 }
 
 void TabStripSceneLayer::UpdateTabStripLeftFade(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj,
     jint resource_id,
     jfloat opacity,
     const JavaParamRef<jobject>& jresource_manager) {
 
   // Hide layer if it's not visible.
   if (opacity == 0.f) {
     left_fade_->SetHideLayerAndSubtree(true);
     return;
   }
 
   // Set UI resource.
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
-  ui::ResourceManager::Resource* fade_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    resource_id);
-  left_fade_->SetUIResourceId(fade_resource->ui_resource->id());
+  ui::Resource* fade_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
+  left_fade_->SetUIResourceId(fade_resource->ui_resource()->id());
 
   // The same resource is used for both left and right fade, so the
   // resource must be rotated for the left fade.
   gfx::Transform fade_transform;
   fade_transform.RotateAboutYAxis(180.0);
   left_fade_->SetTransform(fade_transform);
 
   // Set opacity.
   left_fade_->SetOpacity(opacity);
 
   // Set bounds. Use the parent layer height so the 1px fade resource is
   // stretched vertically.
-  left_fade_->SetBounds(gfx::Size(fade_resource->size.width(),
+  left_fade_->SetBounds(gfx::Size(fade_resource->size().width(),
                                   scrollable_strip_layer_->bounds().height()));
 
   // Set position. The rotation set above requires the layer to be offset
   // by its width in order to display on the left edge.
-  left_fade_->SetPosition(gfx::PointF(fade_resource->size.width(), 0));
+  left_fade_->SetPosition(gfx::PointF(fade_resource->size().width(), 0));
 
   // Ensure layer is visible.
   left_fade_->SetHideLayerAndSubtree(false);
 }
 
 void TabStripSceneLayer::UpdateTabStripRightFade(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj,
     jint resource_id,
     jfloat opacity,
     const JavaParamRef<jobject>& jresource_manager) {
 
   // Hide layer if it's not visible.
   if (opacity == 0.f) {
     right_fade_->SetHideLayerAndSubtree(true);
     return;
   }
 
   // Set UI resource.
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
-  ui::ResourceManager::Resource* fade_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    resource_id);
-  right_fade_->SetUIResourceId(fade_resource->ui_resource->id());
+  ui::Resource* fade_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, resource_id);
+  right_fade_->SetUIResourceId(fade_resource->ui_resource()->id());
 
   // Set opacity.
   right_fade_->SetOpacity(opacity);
 
   // Set bounds. Use the parent layer height so the 1px fade resource is
   // stretched vertically.
-  right_fade_->SetBounds(gfx::Size(
-      fade_resource->size.width(),
-      scrollable_strip_layer_->bounds().height()));
+  right_fade_->SetBounds(gfx::Size(fade_resource->size().width(),
+                                   scrollable_strip_layer_->bounds().height()));
 
   // Set position. The right fade is positioned at the end of the tab strip.
   float x =
-      scrollable_strip_layer_->bounds().width() - fade_resource->size.width();
+      scrollable_strip_layer_->bounds().width() - fade_resource->size().width();
   right_fade_->SetPosition(gfx::PointF(x, 0));
 
   // Ensure layer is visible.
   right_fade_->SetHideLayerAndSubtree(false);
 }
 
 void TabStripSceneLayer::PutStripTabLayer(
     JNIEnv* env,
     const JavaParamRef<jobject>& jobj,
     jint id,
@@ skipping 11 matching lines @@
     jboolean is_loading,
     jfloat spinner_rotation,
     jfloat border_opacity,
     const JavaParamRef<jobject>& jlayer_title_cache,
     const JavaParamRef<jobject>& jresource_manager) {
   LayerTitleCache* layer_title_cache =
       LayerTitleCache::FromJavaObject(jlayer_title_cache);
   ui::ResourceManager* resource_manager =
       ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
   scoped_refptr<TabHandleLayer> layer = GetNextLayer(layer_title_cache);
-  ui::ResourceManager::Resource* tab_handle_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    handle_resource_id);
-  ui::ResourceManager::Resource* close_button_resource =
-      resource_manager->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
-                                    close_resource_id);
+  ui::NinePatchResource* tab_handle_resource =
+      ui::NinePatchResource::From(resource_manager->GetResource(
+          ui::ANDROID_RESOURCE_TYPE_STATIC, handle_resource_id));
+  ui::Resource* close_button_resource = resource_manager->GetResource(
+      ui::ANDROID_RESOURCE_TYPE_STATIC, close_resource_id);
   layer->SetProperties(id, close_button_resource, tab_handle_resource,
                        foreground, close_pressed, toolbar_width, x, y, width,
                        height, content_offset_x, close_button_alpha, is_loading,
                        spinner_rotation, background_tab_brightness_,
                        border_opacity);
 }
 
 scoped_refptr<TabHandleLayer> TabStripSceneLayer::GetNextLayer(
     LayerTitleCache* layer_title_cache) {
   if (write_index_ < tab_handle_layers_.size())
@@ skipping 23 matching lines @@
   // This will automatically bind to the Java object and pass ownership there.
   TabStripSceneLayer* scene_layer = new TabStripSceneLayer(env, jobj);
   return reinterpret_cast<intptr_t>(scene_layer);
 }
 
 bool RegisterTabStripSceneLayer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android