StaticTabSceneLayer owns ToolbarLayer

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 77 matching lines @@
       current_surface_format_(0),
       content_width_(0),
       content_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();
 
   // Explicitly reset these scoped_ptrs here because otherwise we callbacks will
   // try to access member variables during destruction.
   compositor_.reset(NULL);
 }
@@ skipping 120 matching lines @@
   } else {
 #ifndef NDEBUG
     // This should not happen. Setting red background just for debugging.
     SetBackground(true, SK_ColorRED);
 #else
     SetBackground(true, SK_ColorBLACK);
 #endif
   }
 }
 
-void CompositorView::UpdateToolbarLayer(JNIEnv* env,
-                                        const JavaParamRef<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) {
-  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 CompositorView::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) {
-  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);
-}
-
 void CompositorView::FinalizeLayers(JNIEnv* env,
                                     const JavaParamRef<jobject>& jobj) {
   UNSHIPPED_TRACE_EVENT0("compositor", "CompositorView::FinalizeLayers");
 }
 
 void CompositorView::SetNeedsComposite(JNIEnv* env,
                                        const JavaParamRef<jobject>& object) {
   compositor_->SetNeedsComposite();
 }
 
@@ skipping 18 matching lines @@
   // through here but through BrowserChildProcessHostDisconnected() instead.
 }
 
 // Register native methods
 bool RegisterCompositorView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace chrome