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

Side by Side Diff: ui/android/window_android.cc

Issue 1034593002: Fix WindowAndroid leak in Android WebView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « ui/android/window_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "ui/android/window_android.h" 5 #include "ui/android/window_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_weak_ref.h" 9 #include "base/android/jni_weak_ref.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "jni/WindowAndroid_jni.h" 11 #include "jni/WindowAndroid_jni.h"
12 #include "ui/android/window_android_compositor.h" 12 #include "ui/android/window_android_compositor.h"
13 #include "ui/android/window_android_observer.h" 13 #include "ui/android/window_android_observer.h"
14 14
15 namespace ui { 15 namespace ui {
16 16
17 using base::android::AttachCurrentThread; 17 using base::android::AttachCurrentThread;
18 using base::android::ScopedJavaLocalRef; 18 using base::android::ScopedJavaLocalRef;
19 19
20 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) 20 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) : compositor_(NULL) {
21 : weak_java_window_(env, obj), compositor_(NULL) { 21 java_window_.Reset(env, obj);
22 } 22 }
23 23
24 void WindowAndroid::Destroy(JNIEnv* env, jobject obj) { 24 void WindowAndroid::Destroy(JNIEnv* env, jobject obj) {
25 delete this; 25 delete this;
26 } 26 }
27 27
28 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { 28 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() {
29 return weak_java_window_.get(AttachCurrentThread()); 29 return base::android::ScopedJavaLocalRef<jobject>(java_window_);
30 } 30 }
31 31
32 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { 32 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
33 return RegisterNativesImpl(env); 33 return RegisterNativesImpl(env);
34 } 34 }
35 35
36 WindowAndroid::~WindowAndroid() { 36 WindowAndroid::~WindowAndroid() {
37 DCHECK(!compositor_); 37 DCHECK(!compositor_);
38 } 38 }
39 39
(...skipping 25 matching lines...) Expand all
65 void WindowAndroid::DetachCompositor() { 65 void WindowAndroid::DetachCompositor() {
66 compositor_ = NULL; 66 compositor_ = NULL;
67 FOR_EACH_OBSERVER(WindowAndroidObserver, 67 FOR_EACH_OBSERVER(WindowAndroidObserver,
68 observer_list_, 68 observer_list_,
69 OnDetachCompositor()); 69 OnDetachCompositor());
70 observer_list_.Clear(); 70 observer_list_.Clear();
71 } 71 }
72 72
73 void WindowAndroid::RequestVSyncUpdate() { 73 void WindowAndroid::RequestVSyncUpdate() {
74 JNIEnv* env = AttachCurrentThread(); 74 JNIEnv* env = AttachCurrentThread();
75 ScopedJavaLocalRef<jobject> obj = GetJavaObject(); 75 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject().obj());
76 if (obj.is_null())
77 return;
78 Java_WindowAndroid_requestVSyncUpdate(env, obj.obj());
79 } 76 }
80 77
81 void WindowAndroid::SetNeedsAnimate() { 78 void WindowAndroid::SetNeedsAnimate() {
82 if (compositor_) 79 if (compositor_)
83 compositor_->SetNeedsAnimate(); 80 compositor_->SetNeedsAnimate();
84 } 81 }
85 82
86 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { 83 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) {
87 FOR_EACH_OBSERVER( 84 FOR_EACH_OBSERVER(
88 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); 85 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time));
(...skipping 17 matching lines...) Expand all
106 // ---------------------------------------------------------------------------- 103 // ----------------------------------------------------------------------------
107 // Native JNI methods 104 // Native JNI methods
108 // ---------------------------------------------------------------------------- 105 // ----------------------------------------------------------------------------
109 106
110 jlong Init(JNIEnv* env, jobject obj) { 107 jlong Init(JNIEnv* env, jobject obj) {
111 WindowAndroid* window = new WindowAndroid(env, obj); 108 WindowAndroid* window = new WindowAndroid(env, obj);
112 return reinterpret_cast<intptr_t>(window); 109 return reinterpret_cast<intptr_t>(window);
113 } 110 }
114 111
115 } // namespace ui 112 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/window_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698