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

Unified Diff: content/browser/android/java/gin_java_bridge_dispatcher_host.cc

Issue 1124003003: [Android] Fix iteration in GinJavaBridgeDispatcherHost::RemoveHolderAndAdvanceLocked (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/java/gin_java_bridge_dispatcher_host.cc
diff --git a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
index 048fd5f21e4c663b2c0017b71fb7bf0c0660683f..748bd8b2da7b09b8a50fdca45ae9bbeb3224254c 100644
--- a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
+++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
@@ -191,13 +191,16 @@ GinJavaBridgeDispatcherHost::RemoveHolderAndAdvanceLocked(
objects_lock_.AssertAcquired();
JavaObjectWeakGlobalRef result;
scoped_refptr<GinJavaBoundObject> object((*iter_ptr)->second);
+ bool object_erased = false;
if (!object->IsNamed()) {
object->RemoveHolder(holder);
if (!object->HasHolders()) {
result = object->GetWeakRef();
objects_.erase((*iter_ptr)++);
+ object_erased = true;
}
- } else {
+ }
+ if (!object_erased) {
++(*iter_ptr);
}
return result;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698