Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "android_webview/native/aw_gl_functor.h" | 5 #include "android_webview/native/aw_gl_functor.h" |
| 6 | 6 |
| 7 #include "android_webview/public/browser/draw_gl.h" | 7 #include "android_webview/public/browser/draw_gl.h" |
| 8 #include "content/public/browser/browser_thread.h" | 8 #include "content/public/browser/browser_thread.h" |
| 9 #include "jni/AwGLFunctor_jni.h" | 9 #include "jni/AwGLFunctor_jni.h" |
| 10 | 10 |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 93 | 93 |
| 94 static jlong Create(JNIEnv* env, | 94 static jlong Create(JNIEnv* env, |
| 95 const JavaParamRef<jclass>&, | 95 const JavaParamRef<jclass>&, |
| 96 const base::android::JavaParamRef<jobject>& obj) { | 96 const base::android::JavaParamRef<jobject>& obj) { |
| 97 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 97 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 98 return reinterpret_cast<intptr_t>( | 98 return reinterpret_cast<intptr_t>( |
| 99 new AwGLFunctor(JavaObjectWeakGlobalRef(env, obj))); | 99 new AwGLFunctor(JavaObjectWeakGlobalRef(env, obj))); |
| 100 } | 100 } |
| 101 | 101 |
| 102 bool RegisterAwGLFunctor(JNIEnv* env) { | 102 bool RegisterAwGLFunctor(JNIEnv* env) { |
| 103 DCHECK_CURRENTLY_ON(BrowserThread::UI); | |
|
jbudorick
2016/04/25 20:11:38
This change shouldn't be in this CL.
| |
| 103 return RegisterNativesImpl(env); | 104 return RegisterNativesImpl(env); |
| 104 } | 105 } |
| 105 | 106 |
| 106 } // namespace android_webview | 107 } // namespace android_webview |
| OLD | NEW |