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 "chrome/browser/android/compositor/layer/tab_handle_layer.h" | 8 #include "chrome/browser/android/compositor/layer/tab_handle_layer.h" |
9 #include "chrome/browser/android/compositor/layer_title_cache.h" | 9 #include "chrome/browser/android/compositor/layer_title_cache.h" |
| 10 #include "content/public/browser/android/compositor.h" |
10 #include "jni/TabStripSceneLayer_jni.h" | 11 #include "jni/TabStripSceneLayer_jni.h" |
11 #include "ui/android/resources/resource_manager_impl.h" | 12 #include "ui/android/resources/resource_manager_impl.h" |
12 #include "ui/android/resources/ui_resource_android.h" | 13 #include "ui/android/resources/ui_resource_android.h" |
13 | 14 |
14 namespace chrome { | 15 namespace chrome { |
15 namespace android { | 16 namespace android { |
16 | 17 |
17 TabStripSceneLayer::TabStripSceneLayer(JNIEnv* env, jobject jobj) | 18 TabStripSceneLayer::TabStripSceneLayer(JNIEnv* env, jobject jobj) |
18 : SceneLayer(env, jobj), | 19 : SceneLayer(env, jobj), |
19 background_layer_(cc::SolidColorLayer::Create()), | 20 background_layer_( |
20 new_tab_button_(cc::UIResourceLayer::Create()), | 21 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())), |
21 model_selector_button_(cc::UIResourceLayer::Create()), | 22 new_tab_button_( |
| 23 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), |
| 24 model_selector_button_( |
| 25 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())), |
22 strip_brightness_(1.f), | 26 strip_brightness_(1.f), |
23 write_index_(0), | 27 write_index_(0), |
24 content_tree_(nullptr) { | 28 content_tree_(nullptr) { |
25 background_layer_->SetBackgroundColor(SK_ColorBLACK); | 29 background_layer_->SetBackgroundColor(SK_ColorBLACK); |
26 background_layer_->SetIsDrawable(true); | 30 background_layer_->SetIsDrawable(true); |
27 new_tab_button_->SetIsDrawable(true); | 31 new_tab_button_->SetIsDrawable(true); |
28 model_selector_button_->SetIsDrawable(true); | 32 model_selector_button_->SetIsDrawable(true); |
29 layer()->AddChild(background_layer_); | 33 layer()->AddChild(background_layer_); |
30 layer()->AddChild(new_tab_button_); | 34 layer()->AddChild(new_tab_button_); |
31 layer()->AddChild(model_selector_button_); | 35 layer()->AddChild(model_selector_button_); |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 TabStripSceneLayer* scene_layer = new TabStripSceneLayer(env, jobj); | 187 TabStripSceneLayer* scene_layer = new TabStripSceneLayer(env, jobj); |
184 return reinterpret_cast<intptr_t>(scene_layer); | 188 return reinterpret_cast<intptr_t>(scene_layer); |
185 } | 189 } |
186 | 190 |
187 bool RegisterTabStripSceneLayer(JNIEnv* env) { | 191 bool RegisterTabStripSceneLayer(JNIEnv* env) { |
188 return RegisterNativesImpl(env); | 192 return RegisterNativesImpl(env); |
189 } | 193 } |
190 | 194 |
191 } // namespace android | 195 } // namespace android |
192 } // namespace chrome | 196 } // namespace chrome |
OLD | NEW |