| 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 |
| 11 using base::android::JavaParamRef; |
| 12 using base::android::ScopedJavaLocalRef; |
| 13 |
| 11 namespace chrome { | 14 namespace chrome { |
| 12 namespace android { | 15 namespace android { |
| 13 | 16 |
| 14 // static | 17 // static |
| 15 SceneLayer* SceneLayer::FromJavaObject(JNIEnv* env, jobject jobj) { | 18 SceneLayer* SceneLayer::FromJavaObject(JNIEnv* env, jobject jobj) { |
| 16 if (jobj == nullptr) | 19 if (jobj == nullptr) |
| 17 return nullptr; | 20 return nullptr; |
| 18 return reinterpret_cast<SceneLayer*>(Java_SceneLayer_getNativePtr(env, jobj)); | 21 return reinterpret_cast<SceneLayer*>(Java_SceneLayer_getNativePtr(env, jobj)); |
| 19 } | 22 } |
| 20 | 23 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after 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 |