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

Side by Side Diff: android_webview/native/aw_gl_functor.cc

Issue 1904453004: Transfer DrawGLFunctor ownership from AwContents to AwGLFunctor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 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/browser/browser_view_renderer.h" 7 #include "android_webview/browser/browser_view_renderer.h"
8 #include "android_webview/public/browser/draw_gl.h" 8 #include "android_webview/public/browser/draw_gl.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "jni/AwGLFunctor_jni.h" 10 #include "jni/AwGLFunctor_jni.h"
(...skipping 23 matching lines...) Expand all
34 browser_view_renderer_(nullptr) {} 34 browser_view_renderer_(nullptr) {}
35 35
36 AwGLFunctor::~AwGLFunctor() {} 36 AwGLFunctor::~AwGLFunctor() {}
37 37
38 void AwGLFunctor::OnParentDrawConstraintsUpdated() { 38 void AwGLFunctor::OnParentDrawConstraintsUpdated() {
39 DCHECK_CURRENTLY_ON(BrowserThread::UI); 39 DCHECK_CURRENTLY_ON(BrowserThread::UI);
40 if (browser_view_renderer_) 40 if (browser_view_renderer_)
41 browser_view_renderer_->OnParentDrawConstraintsUpdated(); 41 browser_view_renderer_->OnParentDrawConstraintsUpdated();
42 } 42 }
43 43
44 bool AwGLFunctor::RequestDrawGL(bool wait_for_completion) { 44 bool AwGLFunctor::RequestInvokeGL(bool wait_for_completion) {
45 DCHECK_CURRENTLY_ON(BrowserThread::UI); 45 DCHECK_CURRENTLY_ON(BrowserThread::UI);
46 JNIEnv* env = AttachCurrentThread(); 46 JNIEnv* env = AttachCurrentThread();
47 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 47 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
48 if (obj.is_null()) 48 if (obj.is_null())
49 return false; 49 return false;
50 return Java_AwGLFunctor_requestDrawGL(env, obj.obj(), wait_for_completion); 50 return Java_AwGLFunctor_requestInvokeGL(env, obj.obj(), wait_for_completion);
51 } 51 }
52 52
53 void AwGLFunctor::DetachFunctorFromView() { 53 void AwGLFunctor::DetachFunctorFromView() {
54 DCHECK_CURRENTLY_ON(BrowserThread::UI); 54 DCHECK_CURRENTLY_ON(BrowserThread::UI);
55 JNIEnv* env = AttachCurrentThread(); 55 JNIEnv* env = AttachCurrentThread();
56 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 56 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
57 if (!obj.is_null()) 57 if (!obj.is_null())
58 Java_AwGLFunctor_detachFunctorFromView(env, obj.obj()); 58 Java_AwGLFunctor_detachFunctorFromView(env, obj.obj());
59 } 59 }
60 60
(...skipping 30 matching lines...) Expand all
91 const base::android::JavaParamRef<jobject>& obj) { 91 const base::android::JavaParamRef<jobject>& obj) {
92 return reinterpret_cast<intptr_t>( 92 return reinterpret_cast<intptr_t>(
93 new AwGLFunctor(JavaObjectWeakGlobalRef(env, obj))); 93 new AwGLFunctor(JavaObjectWeakGlobalRef(env, obj)));
94 } 94 }
95 95
96 bool RegisterAwGLFunctor(JNIEnv* env) { 96 bool RegisterAwGLFunctor(JNIEnv* env) {
97 return RegisterNativesImpl(env); 97 return RegisterNativesImpl(env);
98 } 98 }
99 99
100 } // namespace android_webview 100 } // namespace android_webview
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698