Move UrlBar background drawing to CC.

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 "cc/layers/layer.h"
 #include "cc/layers/layer_lists.h"
 #include "cc/layers/nine_patch_layer.h"
@@ skipping 78 matching lines @@
                              float brightness,
                              float close_btn_width,
                              float static_to_view_blend,
                              float content_width,
                              float content_height,
                              float view_width,
                              float view_height,
                              bool show_toolbar,
                              int toolbar_background_color,
                              bool anonymize_toolbar,
+                             int toolbar_textbox_resource_id,
                              int toolbar_textbox_background_color,
+                             float toolbar_textbox_alpha,
                              float toolbar_alpha,
                              float toolbar_y_offset,
                              float side_border_scale,
                              bool attach_content,
                              bool inset_border) {
   if (alpha <= 0) {
     layer_->SetHideLayerAndSubtree(true);
     return;
   }
 
   layer_->SetHideLayerAndSubtree(false);
 
   // Grab required resources
   ui::ResourceManager::Resource* border_resource =
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                      border_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* toolbar_resource =
-      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
-                                     toolbar_resource_id);
   ui::ResourceManager::Resource* close_btn_resource =
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                      close_button_resource_id);
   ui::ResourceManager::Resource* back_logo_resource = nullptr;
 
   DecorationTitle* title_layer = nullptr;
 
   //----------------------------------------------------------------------------
   // Handle Border Scaling (Upscale/Downscale everything until final scaling)
   //----------------------------------------------------------------------------
@@ skipping 33 matching lines @@
       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());
   const gfx::Size contour_padding_size(
       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,
+                               anonymize_toolbar,
+                               toolbar_textbox_background_color,
+                               toolbar_textbox_resource_id,
+                               toolbar_textbox_alpha,
+                               false,
+                               1.f,
+                               false);
+  toolbar_layer_->UpdateProgressBar(0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+
   float toolbar_impact_height = 0;
-  if (toolbar_resource) {
-    //--------------------------------------------------------------------------
-    // Update Resource Ids For Layers That Impact Layout
-    //--------------------------------------------------------------------------
-
-    // TODO(kkimlabs): Tab switcher doesn't show the progress bar.
-    toolbar_layer_->PushResource(toolbar_resource,
-                                 toolbar_background_color,
-                                 anonymize_toolbar,
-                                 toolbar_textbox_background_color,
-                                 false,
-                                 1.f);
-    toolbar_layer_->UpdateProgressBar(0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-
-    if (show_toolbar && !back_visible)
-      toolbar_impact_height = toolbar_resource->padding.height();
-  }
+  if (show_toolbar && !back_visible)
+    toolbar_impact_height = toolbar_layer_->layer()->bounds().height();
 
   //----------------------------------------------------------------------------
   // Compute Alpha and Visibility
   //----------------------------------------------------------------------------
   border_alpha *= alpha;
   contour_alpha *= alpha;
   shadow_alpha *= alpha;
   close_alpha *= alpha;
   toolbar_alpha *= alpha;
 
@@ skipping 330 matching lines @@
 }
 
 TabLayer::TabLayer(bool incognito,
                    ui::ResourceManager* resource_manager,
                    LayerTitleCache* layer_title_cache,
                    TabContentManager* tab_content_manager)
     : incognito_(incognito),
       resource_manager_(resource_manager),
       layer_title_cache_(layer_title_cache),
       layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
-      toolbar_layer_(ToolbarLayer::Create()),
+      toolbar_layer_(ToolbarLayer::Create(resource_manager)),
       title_(cc::Layer::Create(content::Compositor::LayerSettings())),
       content_(ContentLayer::Create(tab_content_manager)),
       padding_(
           cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
       close_button_(
           cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
       front_border_(
           cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
       contour_shadow_(
           cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
@@ skipping 34 matching lines @@
       title_->AddChild(layer);
     }
   }
 
   if (title)
     title->SetUIResourceIds();
 }
 
 }  //  namespace android
 }  //  namespace chrome