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

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

Issue 1747783002: CC Animation: Erase old animation system in Android Compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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/scene_layer.h" 5 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/layers/layer_settings.h"
8 #include "content/public/browser/android/compositor.h" 9 #include "content/public/browser/android/compositor.h"
9 #include "jni/SceneLayer_jni.h" 10 #include "jni/SceneLayer_jni.h"
10 11
11 namespace chrome { 12 namespace chrome {
12 namespace android { 13 namespace android {
13 14
14 // static 15 // static
15 SceneLayer* SceneLayer::FromJavaObject(JNIEnv* env, jobject jobj) { 16 SceneLayer* SceneLayer::FromJavaObject(JNIEnv* env, jobject jobj) {
16 if (jobj == nullptr) 17 if (jobj == nullptr)
17 return nullptr; 18 return nullptr;
18 return reinterpret_cast<SceneLayer*>(Java_SceneLayer_getNativePtr(env, jobj)); 19 return reinterpret_cast<SceneLayer*>(Java_SceneLayer_getNativePtr(env, jobj));
19 } 20 }
20 21
21 SceneLayer::SceneLayer(JNIEnv* env, jobject jobj) 22 SceneLayer::SceneLayer(JNIEnv* env, jobject jobj)
22 : SceneLayer(env, 23 : SceneLayer(env,
23 jobj, 24 jobj,
24 cc::Layer::Create(content::Compositor::LayerSettings())) { 25 cc::Layer::Create(cc::LayerSettings())) {
25 } 26 }
26 27
27 SceneLayer::SceneLayer(JNIEnv* env, 28 SceneLayer::SceneLayer(JNIEnv* env,
28 jobject jobj, 29 jobject jobj,
29 scoped_refptr<cc::Layer> layer) 30 scoped_refptr<cc::Layer> layer)
30 : weak_java_scene_layer_(env, jobj), layer_(layer) { 31 : weak_java_scene_layer_(env, jobj), layer_(layer) {
31 Java_SceneLayer_setNativePtr(env, jobj, reinterpret_cast<intptr_t>(this)); 32 Java_SceneLayer_setNativePtr(env, jobj, reinterpret_cast<intptr_t>(this));
32 } 33 }
33 34
34 SceneLayer::~SceneLayer() { 35 SceneLayer::~SceneLayer() {
(...skipping 28 matching lines...) Expand all
63 SceneLayer* tree_provider = new SceneLayer(env, jobj); 64 SceneLayer* tree_provider = new SceneLayer(env, jobj);
64 return reinterpret_cast<intptr_t>(tree_provider); 65 return reinterpret_cast<intptr_t>(tree_provider);
65 } 66 }
66 67
67 bool RegisterSceneLayer(JNIEnv* env) { 68 bool RegisterSceneLayer(JNIEnv* env) {
68 return RegisterNativesImpl(env); 69 return RegisterNativesImpl(env);
69 } 70 }
70 71
71 } // namespace android 72 } // namespace android
72 } // namespace chrome 73 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698