Bug 1065811 - Track Xray waivers with CPOWs. r=billm

2014-09-25 13:13:29 +02:00
parent 4088e55174
commit f2b9845ecb
8 changed files with 56 additions and 25 deletions
--- a/js/ipc/WrapperAnswer.cpp
+++ b/js/ipc/WrapperAnswer.cpp
@@ -679,9 +679,9 @@ WrapperAnswer::AnswerIsConstructor(const ObjectId &objId, bool *result)
 bool
 WrapperAnswer::RecvDropObject(const ObjectId &objId)
 {
-    JSObject *obj = findObjectById(objId);
+    JSObject *obj = objects_.find(objId);
    if (obj) {
-        objectIds_.remove(obj);
+        objectIdMap(objId.hasXrayWaiver()).remove(obj);
        objects_.remove(objId);
    }
    return true;