Index: device/power_save_blocker/power_save_blocker_android.cc |
diff --git a/device/power_save_blocker/power_save_blocker_android.cc b/device/power_save_blocker/power_save_blocker_android.cc |
index 252ff02d6f71d0bb83a032ed708a1e7d95227547..e2bff24f2946cd9218b503f9a0b5217fbe82d573 100644 |
--- a/device/power_save_blocker/power_save_blocker_android.cc |
+++ b/device/power_save_blocker/power_save_blocker_android.cc |
@@ -34,6 +34,8 @@ class PowerSaveBlocker::Delegate |
base::android::ScopedJavaGlobalRef<jobject> java_power_save_blocker_; |
+ base::android::ScopedJavaGlobalRef<jobject> anchor_view_; |
+ |
scoped_refptr<base::SequencedTaskRunner> ui_task_runner_; |
DISALLOW_COPY_AND_ASSIGN(Delegate); |
@@ -55,8 +57,8 @@ void PowerSaveBlocker::Delegate::ApplyBlock() { |
ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_); |
JNIEnv* env = AttachCurrentThread(); |
if (view_android_) { |
- Java_PowerSaveBlocker_applyBlock( |
- env, obj.obj(), view_android_->GetViewAndroidDelegate().obj()); |
+ anchor_view_.Reset(view_android_->AcquireAnchorView()); |
+ Java_PowerSaveBlocker_applyBlock(env, obj.obj(), anchor_view_.obj()); |
} |
} |
@@ -65,8 +67,8 @@ void PowerSaveBlocker::Delegate::RemoveBlock() { |
ScopedJavaLocalRef<jobject> obj(java_power_save_blocker_); |
JNIEnv* env = AttachCurrentThread(); |
if (view_android_) { |
no sievers
2016/07/14 23:14:32
Here we also have to figure out how to not leak it
Jinsuk Kim
2016/07/15 05:46:26
Added RemoveAnchorView/Reset()
no sievers
2016/07/15 18:35:00
The problem here is this:
if (view_android_) {
}
Jinsuk Kim
2016/07/18 06:45:46
Now I got it. Added ScopedAnchorView to remove the
|
- Java_PowerSaveBlocker_removeBlock( |
- env, obj.obj(), view_android_->GetViewAndroidDelegate().obj()); |
+ Java_PowerSaveBlocker_removeBlock(env, obj.obj()); |
+ view_android_->RemoveAnchorView(anchor_view_.obj()); |
} |
} |