Move UrlBar background drawing to CC.

chrome/browser/android/compositor/compositor_view.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/compositor_view.h"
 
 #include <vector>
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
@@ skipping 66 matching lines @@
                                jobject obj,
                                jint empty_background_color,
                                jboolean low_mem_device,
                                ui::WindowAndroid* window_android,
                                LayerTitleCache* layer_title_cache,
                                TabContentManager* tab_content_manager)
     : layer_title_cache_(layer_title_cache),
       tab_content_manager_(tab_content_manager),
       root_layer_(
           cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
-      toolbar_layer_(ToolbarLayer::Create()),
       scene_layer_(nullptr),
       current_surface_format_(0),
       content_width_(0),
       content_height_(0),
       overdraw_bottom_height_(0),
       overlay_video_mode_(false),
       empty_background_color_(empty_background_color),
       weak_factory_(this) {
   content::BrowserChildProcessObserver::Add(this);
   obj_.Reset(env, obj);
   compositor_.reset(content::Compositor::Create(this, window_android));
 
+  toolbar_layer_ = ToolbarLayer::Create(&(compositor_->GetResourceManager()));
+
   root_layer_->SetIsDrawable(true);
   root_layer_->SetBackgroundColor(SK_ColorWHITE);
 
   toolbar_layer_->layer()->SetHideLayerAndSubtree(true);
   root_layer_->AddChild(toolbar_layer_->layer());
 }
 
 CompositorView::~CompositorView() {
   content::BrowserChildProcessObserver::Remove(this);
   tab_content_manager_->OnUIResourcesWereEvicted();
@@ skipping 132 matching lines @@
 }
 
 int CompositorView::GetUsableContentHeight() {
   return std::max(content_height_ - overdraw_bottom_height_, 0);
 }
 
 void CompositorView::UpdateToolbarLayer(JNIEnv* env,
                                         jobject object,
                                         jint toolbar_resource_id,
                                         jint toolbar_background_color,
+                                        jint url_bar_resource_id,
+                                        jfloat url_bar_alpha,
                                         jfloat top_offset,
                                         jfloat brightness,
                                         bool visible,
                                         bool show_shadow) {
-  // Ensure the toolbar resource is available before making the layer visible.
-  ui::ResourceManager::Resource* resource =
-      compositor_->GetResourceManager().GetResource(
-          ui::ANDROID_RESOURCE_TYPE_DYNAMIC, toolbar_resource_id);
-  if (!resource)
-    visible = false;
-
   toolbar_layer_->layer()->SetHideLayerAndSubtree(!visible);
   if (visible) {
     toolbar_layer_->layer()->SetPosition(gfx::PointF(0, top_offset));
-    toolbar_layer_->PushResource(resource, toolbar_background_color, false,
-                                 SK_ColorWHITE, false, brightness);
-
     // If we're at rest, hide the shadow.  The Android view should be drawing.
-    toolbar_layer_->layer()->SetMasksToBounds(top_offset >= 0.f
-                                              && !show_shadow);
+    bool clip_shadow = top_offset >= 0.f && !show_shadow;
+    toolbar_layer_->PushResource(toolbar_resource_id, toolbar_background_color,
+                                 false, SK_ColorWHITE, url_bar_resource_id,
+                                 url_bar_alpha, false, brightness, clip_shadow);
   }
 }
 
 void CompositorView::UpdateProgressBar(JNIEnv* env,
                                        jobject object,
                                        jint progress_bar_x,
                                        jint progress_bar_y,
                                        jint progress_bar_width,
                                        jint progress_bar_height,
                                        jint progress_bar_color,
@@ skipping 43 matching lines @@
   // through here but through BrowserChildProcessHostDisconnected() instead.
 }
 
 // Register native methods
 bool RegisterCompositorView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace chrome