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

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

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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/static_tab_scene_layer.h " 5 #include "chrome/browser/android/compositor/scene_layer/static_tab_scene_layer.h "
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "chrome/browser/android/compositor/layer/content_layer.h" 8 #include "chrome/browser/android/compositor/layer/content_layer.h"
9 #include "chrome/browser/android/compositor/layer_title_cache.h" 9 #include "chrome/browser/android/compositor/layer_title_cache.h"
10 #include "chrome/browser/android/compositor/tab_content_manager.h" 10 #include "chrome/browser/android/compositor/tab_content_manager.h"
11 #include "content/public/browser/android/compositor.h"
11 #include "jni/StaticTabSceneLayer_jni.h" 12 #include "jni/StaticTabSceneLayer_jni.h"
12 #include "third_party/skia/include/core/SkColor.h" 13 #include "third_party/skia/include/core/SkColor.h"
13 14
14 namespace chrome { 15 namespace chrome {
15 namespace android { 16 namespace android {
16 17
17 StaticTabSceneLayer::StaticTabSceneLayer(JNIEnv* env, jobject jobj) 18 StaticTabSceneLayer::StaticTabSceneLayer(JNIEnv* env, jobject jobj)
18 : SceneLayer(env, jobj), 19 : SceneLayer(env, jobj),
19 last_set_tab_id_(-1), 20 last_set_tab_id_(-1),
20 background_color_(SK_ColorWHITE) { 21 background_color_(SK_ColorWHITE) {
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 StaticTabSceneLayer* scene_layer = new StaticTabSceneLayer(env, jobj); 130 StaticTabSceneLayer* scene_layer = new StaticTabSceneLayer(env, jobj);
130 return reinterpret_cast<intptr_t>(scene_layer); 131 return reinterpret_cast<intptr_t>(scene_layer);
131 } 132 }
132 133
133 bool RegisterStaticTabSceneLayer(JNIEnv* env) { 134 bool RegisterStaticTabSceneLayer(JNIEnv* env) {
134 return RegisterNativesImpl(env); 135 return RegisterNativesImpl(env);
135 } 136 }
136 137
137 } // namespace android 138 } // namespace android
138 } // namespace chrome 139 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698