Move UrlBar background drawing to CC.

chrome/browser/android/compositor/layer/toolbar_layer.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/layers/nine_patch_layer.h"
 #include "chrome/browser/android/compositor/layer/layer.h"
 #include "ui/android/resources/resource_manager.h"
 
 namespace cc {
 class Layer;
 class SolidColorLayer;
 class UIResourceLayer;
 }
 
 namespace chrome {
 namespace android {
 
 class ToolbarLayer : public Layer {
  public:
-  static scoped_refptr<ToolbarLayer> Create();
+  static scoped_refptr<ToolbarLayer> Create(
+      ui::ResourceManager* resource_manager);
 
   // Implements Layer
   scoped_refptr<cc::Layer> layer() override;
 
   void PushResource(ui::ResourceManager::Resource* resource,
                     int toolbar_background_color,
                     bool anonymize,
                     int  toolbar_textbox_background_color,
+                    int url_bar_background_resource_id,
+                    float url_bar_alpha,
                     bool show_debug,
                     float brightness);
 
   void UpdateProgressBar(int progress_bar_x,
                          int progress_bar_y,
                          int progress_bar_width,
                          int progress_bar_height,
                          int progress_bar_color,
                          int progress_bar_background_x,
                          int progress_bar_background_y,
                          int progress_bar_background_width,
                          int progress_bar_background_height,
                          int progress_bar_background_color);
 
  protected:
-  ToolbarLayer();
+  explicit ToolbarLayer(ui::ResourceManager* resource_manager);
   ~ToolbarLayer() override;
 
  private:
+  ui::ResourceManager* resource_manager_;

[David Trainor- moved to gerrit, 2015/11/02 16:25:08]

If we're going to save the resource manager, we might not want to pass the
actual Resource in PushResource.  Might as well push IDs for everything.

[aurimas (slooooooooow), 2015/11/02 19:31:46]

Done

+
   scoped_refptr<cc::Layer> layer_;
   scoped_refptr<cc::SolidColorLayer> toolbar_background_layer_;
+  scoped_refptr<cc::NinePatchLayer> url_bar_background_layer_;
   scoped_refptr<cc::UIResourceLayer> bitmap_layer_;
   scoped_refptr<cc::SolidColorLayer> progress_bar_layer_;
   scoped_refptr<cc::SolidColorLayer> progress_bar_background_layer_;
   scoped_refptr<cc::SolidColorLayer> anonymize_layer_;
   scoped_refptr<cc::SolidColorLayer> debug_layer_;
   float brightness_;
 
   DISALLOW_COPY_AND_ASSIGN(ToolbarLayer);
 };
 
 }  //  namespace android
 }  //  namespace chrome
 
 #endif  // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_TOOLBAR_LAYER_H_