Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(316)

Side by Side Diff: chrome/browser/android/compositor/scene_layer/tab_list_scene_layer.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_list_scene_layer.h" 5 #include "chrome/browser/android/compositor/scene_layer/tab_list_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"
9 #include "chrome/browser/android/compositor/layer/content_layer.h" 8 #include "chrome/browser/android/compositor/layer/content_layer.h"
10 #include "chrome/browser/android/compositor/layer/tab_layer.h" 9 #include "chrome/browser/android/compositor/layer/tab_layer.h"
11 #include "chrome/browser/android/compositor/layer_title_cache.h" 10 #include "chrome/browser/android/compositor/layer_title_cache.h"
12 #include "chrome/browser/android/compositor/tab_content_manager.h" 11 #include "chrome/browser/android/compositor/tab_content_manager.h"
13 #include "content/public/browser/android/compositor.h" 12 #include "content/public/browser/android/compositor.h"
14 #include "jni/TabListSceneLayer_jni.h" 13 #include "jni/TabListSceneLayer_jni.h"
15 #include "ui/android/resources/resource_manager_impl.h" 14 #include "ui/android/resources/resource_manager_impl.h"
16 15
17 namespace chrome { 16 namespace chrome {
18 namespace android { 17 namespace android {
19 18
20 TabListSceneLayer::TabListSceneLayer(JNIEnv* env, jobject jobj) 19 TabListSceneLayer::TabListSceneLayer(JNIEnv* env, jobject jobj)
21 : SceneLayer(env, jobj), 20 : SceneLayer(env, jobj),
22 content_obscures_self_(false), 21 content_obscures_self_(false),
23 write_index_(0), 22 write_index_(0),
24 resource_manager_(nullptr), 23 resource_manager_(nullptr),
25 layer_title_cache_(nullptr), 24 layer_title_cache_(nullptr),
26 tab_content_manager_(nullptr), 25 tab_content_manager_(nullptr),
27 background_color_(SK_ColorWHITE), 26 background_color_(SK_ColorWHITE),
28 own_tree_(cc::Layer::Create(cc::LayerSettings())) { 27 own_tree_(cc::Layer::Create()) {
29 layer()->AddChild(own_tree_); 28 layer()->AddChild(own_tree_);
30 } 29 }
31 30
32 TabListSceneLayer::~TabListSceneLayer() { 31 TabListSceneLayer::~TabListSceneLayer() {
33 } 32 }
34 33
35 void TabListSceneLayer::SetContentTree( 34 void TabListSceneLayer::SetContentTree(
36 JNIEnv* env, 35 JNIEnv* env,
37 const JavaParamRef<jobject>& jobj, 36 const JavaParamRef<jobject>& jobj,
38 const JavaParamRef<jobject>& jcontent_tree) { 37 const JavaParamRef<jobject>& jcontent_tree) {
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 TabListSceneLayer* scene_layer = new TabListSceneLayer(env, jobj); 221 TabListSceneLayer* scene_layer = new TabListSceneLayer(env, jobj);
223 return reinterpret_cast<intptr_t>(scene_layer); 222 return reinterpret_cast<intptr_t>(scene_layer);
224 } 223 }
225 224
226 bool RegisterTabListSceneLayer(JNIEnv* env) { 225 bool RegisterTabListSceneLayer(JNIEnv* env) {
227 return RegisterNativesImpl(env); 226 return RegisterNativesImpl(env);
228 } 227 }
229 228
230 } // namespace android 229 } // namespace android
231 } // namespace chrome 230 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698