StaticTabSceneLayer owns ToolbarLayer

chrome/browser/android/compositor/scene_layer/static_tab_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/static_tab_scene_layer.h"
 
 #include "cc/layers/layer.h"
 #include "chrome/browser/android/compositor/layer/content_layer.h"
+#include "chrome/browser/android/compositor/layer/toolbar_layer.h"
 #include "chrome/browser/android/compositor/layer_title_cache.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "content/public/browser/android/compositor.h"
 #include "jni/StaticTabSceneLayer_jni.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/android/resources/resource_manager_impl.h"
 
 namespace chrome {
 namespace android {
 
 StaticTabSceneLayer::StaticTabSceneLayer(JNIEnv* env, jobject jobj)
     : SceneLayer(env, jobj),
       last_set_tab_id_(-1),
       background_color_(SK_ColorWHITE),
       brightness_(1.f) {
 }
@@ skipping 112 matching lines @@
   }
 
   // TODO(pedrosimonetti): Consider being smarter with regards to when to
   // add the layer to the hierarchy. For now, we need to keep adding the
   // content_scene_layer on every frame because the content_layer is also
   // added on every frame. This means that if we only add it once, the
   // content_layer will be added again on the next frame and will
   // occlude the content_scene_layer.
   if (layer) {
     content_scene_layer_ = layer;
     layer_->AddChild(layer);

[David Trainor- moved to gerrit, 2016/02/24 17:06:10]

Can't we just insert this layer at the beginning so we don't have to readd the
toolbar layer to move it to the end?

[mdjones, 2016/02/25 21:38:01]

Removed this whole function as it actually doesn't make sense in the new
architecture.

The layer is added in the correct place when it is created.

+    if (toolbar_layer_) layer_->AddChild(toolbar_layer_->layer());
   }
 }
 
+void StaticTabSceneLayer::UpdateToolbarLayer(
+    JNIEnv* env,
+    const JavaParamRef<jobject>& object,
+    const JavaParamRef<jobject>& jresource_manager,
+    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) {
+  // If the toolbar layer has not been created yet, create it.
+  if (!toolbar_layer_) {
+    ui::ResourceManager* resource_manager =
+        ui::ResourceManagerImpl::FromJavaObject(jresource_manager);
+    toolbar_layer_ = ToolbarLayer::Create(resource_manager);
+    toolbar_layer_->layer()->SetHideLayerAndSubtree(true);
+  }
+
+  layer_->AddChild(toolbar_layer_->layer());
+  toolbar_layer_->layer()->SetHideLayerAndSubtree(!visible);
+  if (visible) {
+    toolbar_layer_->layer()->SetPosition(gfx::PointF(0, top_offset));
+    // If we're at rest, hide the shadow.  The Android view should be drawing.
+    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 StaticTabSceneLayer::UpdateProgressBar(JNIEnv* env,
+                                       const JavaParamRef<jobject>& object,
+                                       jint progress_bar_x,
+                                       jint progress_bar_y,
+                                       jint progress_bar_width,
+                                       jint progress_bar_height,
+                                       jint progress_bar_color,
+                                       jint progress_bar_background_x,
+                                       jint progress_bar_background_y,
+                                       jint progress_bar_background_width,
+                                       jint progress_bar_background_height,
+                                       jint progress_bar_background_color) {
+  if (!toolbar_layer_) return;
+  toolbar_layer_->UpdateProgressBar(progress_bar_x,
+                                    progress_bar_y,
+                                    progress_bar_width,
+                                    progress_bar_height,
+                                    progress_bar_color,
+                                    progress_bar_background_x,
+                                    progress_bar_background_y,
+                                    progress_bar_background_width,
+                                    progress_bar_background_height,
+                                    progress_bar_background_color);
+}
+
 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& jobj) {
   // This will automatically bind to the Java object and pass ownership there.
   StaticTabSceneLayer* scene_layer = new StaticTabSceneLayer(env, jobj);
   return reinterpret_cast<intptr_t>(scene_layer);
 }
 
 bool RegisterStaticTabSceneLayer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace chrome