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/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 "content/public/browser/android/compositor.h" |
8 #include "jni/SceneLayer_jni.h" | 9 #include "jni/SceneLayer_jni.h" |
9 | 10 |
10 namespace chrome { | 11 namespace chrome { |
11 namespace android { | 12 namespace android { |
12 | 13 |
13 // static | 14 // static |
14 SceneLayer* SceneLayer::FromJavaObject(JNIEnv* env, jobject jobj) { | 15 SceneLayer* SceneLayer::FromJavaObject(JNIEnv* env, jobject jobj) { |
15 if (jobj == nullptr) | 16 if (jobj == nullptr) |
16 return nullptr; | 17 return nullptr; |
17 return reinterpret_cast<SceneLayer*>(Java_SceneLayer_getNativePtr(env, jobj)); | 18 return reinterpret_cast<SceneLayer*>(Java_SceneLayer_getNativePtr(env, jobj)); |
18 } | 19 } |
19 | 20 |
20 SceneLayer::SceneLayer(JNIEnv* env, jobject jobj) | 21 SceneLayer::SceneLayer(JNIEnv* env, jobject jobj) |
21 : SceneLayer(env, jobj, cc::Layer::Create()) { | 22 : SceneLayer(env, |
| 23 jobj, |
| 24 cc::Layer::Create(content::Compositor::LayerSettings())) { |
22 } | 25 } |
23 | 26 |
24 SceneLayer::SceneLayer(JNIEnv* env, | 27 SceneLayer::SceneLayer(JNIEnv* env, |
25 jobject jobj, | 28 jobject jobj, |
26 scoped_refptr<cc::Layer> layer) | 29 scoped_refptr<cc::Layer> layer) |
27 : weak_java_scene_layer_(env, jobj), layer_(layer) { | 30 : weak_java_scene_layer_(env, jobj), layer_(layer) { |
28 Java_SceneLayer_setNativePtr(env, jobj, reinterpret_cast<intptr_t>(this)); | 31 Java_SceneLayer_setNativePtr(env, jobj, reinterpret_cast<intptr_t>(this)); |
29 } | 32 } |
30 | 33 |
31 SceneLayer::~SceneLayer() { | 34 SceneLayer::~SceneLayer() { |
(...skipping 28 matching lines...) Expand all Loading... |
60 SceneLayer* tree_provider = new SceneLayer(env, jobj); | 63 SceneLayer* tree_provider = new SceneLayer(env, jobj); |
61 return reinterpret_cast<intptr_t>(tree_provider); | 64 return reinterpret_cast<intptr_t>(tree_provider); |
62 } | 65 } |
63 | 66 |
64 bool RegisterSceneLayer(JNIEnv* env) { | 67 bool RegisterSceneLayer(JNIEnv* env) { |
65 return RegisterNativesImpl(env); | 68 return RegisterNativesImpl(env); |
66 } | 69 } |
67 | 70 |
68 } // namespace android | 71 } // namespace android |
69 } // namespace chrome | 72 } // namespace chrome |
OLD | NEW |