| Index: content/renderer/java/gin_java_bridge_dispatcher.cc
|
| diff --git a/content/renderer/java/gin_java_bridge_dispatcher.cc b/content/renderer/java/gin_java_bridge_dispatcher.cc
|
| index e4caa5491befc5f6d497e7bd43c35a8e34eba8d6..820c6ce3437e76ab31d19ac1473121da3a9602f0 100644
|
| --- a/content/renderer/java/gin_java_bridge_dispatcher.cc
|
| +++ b/content/renderer/java/gin_java_bridge_dispatcher.cc
|
| @@ -123,9 +123,11 @@ GinJavaBridgeObject* GinJavaBridgeDispatcher::GetObject(ObjectID object_id) {
|
| return result;
|
| }
|
|
|
| -void GinJavaBridgeDispatcher::OnGinJavaBridgeObjectDeleted(ObjectID object_id) {
|
| - if (!objects_.Lookup(object_id))
|
| - return;
|
| +void GinJavaBridgeDispatcher::OnGinJavaBridgeObjectDeleted(
|
| + GinJavaBridgeObject* object) {
|
| + int object_id = object->object_id();
|
| + // Ignore cleaning up of old object wrappers.
|
| + if (objects_.Lookup(object_id) != object) return;
|
| objects_.Remove(object_id);
|
| render_frame()->Send(
|
| new GinJavaBridgeHostMsg_ObjectWrapperDeleted(routing_id(), object_id));
|
|
|