| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h" | 5 #include "chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "cc/layers/layer_settings.h" |
| 8 #include "cc/resources/scoped_ui_resource.h" | 9 #include "cc/resources/scoped_ui_resource.h" |
| 9 #include "chrome/browser/android/compositor/layer/tab_handle_layer.h" | 10 #include "chrome/browser/android/compositor/layer/tab_handle_layer.h" |
| 10 #include "chrome/browser/android/compositor/layer_title_cache.h" | 11 #include "chrome/browser/android/compositor/layer_title_cache.h" |
| 11 #include "content/public/browser/android/compositor.h" | 12 #include "content/public/browser/android/compositor.h" |
| 12 #include "jni/TabStripSceneLayer_jni.h" | 13 #include "jni/TabStripSceneLayer_jni.h" |
| 13 #include "ui/android/resources/resource_manager_impl.h" | 14 #include "ui/android/resources/resource_manager_impl.h" |
| 14 | 15 |
| 15 namespace chrome { | 16 namespace chrome { |
| 16 namespace android { | 17 namespace android { |
| 17 | 18 |
| 18 TabStripSceneLayer::TabStripSceneLayer(JNIEnv* env, jobject jobj) | 19 TabStripSceneLayer::TabStripSceneLayer(JNIEnv* env, jobject jobj) |
| 19 : SceneLayer(env, jobj), | 20 : SceneLayer(env, jobj), |
| 20 tab_strip_layer_( | 21 tab_strip_layer_( |
| 21 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())), | 22 cc::SolidColorLayer::Create(cc::LayerSettings())), |
| 22 new_tab_button_( | 23 new_tab_button_( |
| 23 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), | 24 cc::UIResourceLayer::Create(cc::LayerSettings())), |
| 24 model_selector_button_( | 25 model_selector_button_( |
| 25 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), | 26 cc::UIResourceLayer::Create(cc::LayerSettings())), |
| 26 background_tab_brightness_(1.f), | 27 background_tab_brightness_(1.f), |
| 27 brightness_(1.f), | 28 brightness_(1.f), |
| 28 write_index_(0), | 29 write_index_(0), |
| 29 content_tree_(nullptr) { | 30 content_tree_(nullptr) { |
| 30 new_tab_button_->SetIsDrawable(true); | 31 new_tab_button_->SetIsDrawable(true); |
| 31 model_selector_button_->SetIsDrawable(true); | 32 model_selector_button_->SetIsDrawable(true); |
| 32 tab_strip_layer_->SetBackgroundColor(SK_ColorBLACK); | 33 tab_strip_layer_->SetBackgroundColor(SK_ColorBLACK); |
| 33 tab_strip_layer_->SetIsDrawable(true); | 34 tab_strip_layer_->SetIsDrawable(true); |
| 34 tab_strip_layer_->AddChild(new_tab_button_); | 35 tab_strip_layer_->AddChild(new_tab_button_); |
| 35 tab_strip_layer_->AddChild(model_selector_button_); | 36 tab_strip_layer_->AddChild(model_selector_button_); |
| (...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 TabStripSceneLayer* scene_layer = new TabStripSceneLayer(env, jobj); | 228 TabStripSceneLayer* scene_layer = new TabStripSceneLayer(env, jobj); |
| 228 return reinterpret_cast<intptr_t>(scene_layer); | 229 return reinterpret_cast<intptr_t>(scene_layer); |
| 229 } | 230 } |
| 230 | 231 |
| 231 bool RegisterTabStripSceneLayer(JNIEnv* env) { | 232 bool RegisterTabStripSceneLayer(JNIEnv* env) { |
| 232 return RegisterNativesImpl(env); | 233 return RegisterNativesImpl(env); |
| 233 } | 234 } |
| 234 | 235 |
| 235 } // namespace android | 236 } // namespace android |
| 236 } // namespace chrome | 237 } // namespace chrome |
| OLD | NEW |