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 "content/public/browser/android/compositor.h" |
9 #include "jni/SceneLayer_jni.h" | 9 #include "jni/SceneLayer_jni.h" |
10 | 10 |
(...skipping 20 matching lines...) Expand all Loading... |
31 Java_SceneLayer_setNativePtr(env, jobj, reinterpret_cast<intptr_t>(this)); | 31 Java_SceneLayer_setNativePtr(env, jobj, reinterpret_cast<intptr_t>(this)); |
32 } | 32 } |
33 | 33 |
34 SceneLayer::~SceneLayer() { | 34 SceneLayer::~SceneLayer() { |
35 JNIEnv* env = base::android::AttachCurrentThread(); | 35 JNIEnv* env = base::android::AttachCurrentThread(); |
36 ScopedJavaLocalRef<jobject> jobj = weak_java_scene_layer_.get(env); | 36 ScopedJavaLocalRef<jobject> jobj = weak_java_scene_layer_.get(env); |
37 if (jobj.is_null()) | 37 if (jobj.is_null()) |
38 return; | 38 return; |
39 | 39 |
40 Java_SceneLayer_setNativePtr( | 40 Java_SceneLayer_setNativePtr( |
41 env, jobj.obj(), | 41 env, jobj, reinterpret_cast<intptr_t>(static_cast<SceneLayer*>(NULL))); |
42 reinterpret_cast<intptr_t>(static_cast<SceneLayer*>(NULL))); | |
43 } | 42 } |
44 | 43 |
45 void SceneLayer::OnDetach() { | 44 void SceneLayer::OnDetach() { |
46 layer()->RemoveFromParent(); | 45 layer()->RemoveFromParent(); |
47 } | 46 } |
48 | 47 |
49 void SceneLayer::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) { | 48 void SceneLayer::Destroy(JNIEnv* env, const JavaParamRef<jobject>& jobj) { |
50 delete this; | 49 delete this; |
51 } | 50 } |
52 | 51 |
(...skipping 10 matching lines...) Expand all Loading... |
63 SceneLayer* tree_provider = new SceneLayer(env, jobj); | 62 SceneLayer* tree_provider = new SceneLayer(env, jobj); |
64 return reinterpret_cast<intptr_t>(tree_provider); | 63 return reinterpret_cast<intptr_t>(tree_provider); |
65 } | 64 } |
66 | 65 |
67 bool RegisterSceneLayer(JNIEnv* env) { | 66 bool RegisterSceneLayer(JNIEnv* env) { |
68 return RegisterNativesImpl(env); | 67 return RegisterNativesImpl(env); |
69 } | 68 } |
70 | 69 |
71 } // namespace android | 70 } // namespace android |
72 } // namespace chrome | 71 } // namespace chrome |
OLD | NEW |