From cf319d581ca94d304a1a9741a5466c96d9179ce6 Mon Sep 17 00:00:00 2001
From: win7-7 <win7-7@users.noreply.github.com>
Date: Mon, 29 Apr 2019 12:08:50 +0300
Subject: Improve dead compartment collection js/ipc

---
 js/ipc/JavaScriptShared.cpp | 11 ++++++++++-
 js/ipc/JavaScriptShared.h   |  3 ++-
 js/ipc/WrapperAnswer.cpp    |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'js/ipc')

diff --git a/js/ipc/JavaScriptShared.cpp b/js/ipc/JavaScriptShared.cpp
index 9786243f2..aba02252d 100644
--- a/js/ipc/JavaScriptShared.cpp
+++ b/js/ipc/JavaScriptShared.cpp
@@ -61,6 +61,15 @@ IdToObjectMap::find(ObjectId id)
     return p->value();
 }
 
+JSObject*
+IdToObjectMap::findPreserveColor(ObjectId id)
+{
+	Table::Ptr p = table_.lookup(id);
+	if (!p)
+		return nullptr;
+	return p->value().unbarrieredGet();
+	}
+
 bool
 IdToObjectMap::add(ObjectId id, JSObject* obj)
 {
@@ -757,4 +766,4 @@ CPOWManager*
 mozilla::jsipc::CPOWManagerFor(PJavaScriptChild* aChild)
 {
     return static_cast<JavaScriptChild*>(aChild);
-}
+}
\ No newline at end of file
diff --git a/js/ipc/JavaScriptShared.h b/js/ipc/JavaScriptShared.h
index 4de153826..d0cd4615b 100644
--- a/js/ipc/JavaScriptShared.h
+++ b/js/ipc/JavaScriptShared.h
@@ -96,6 +96,7 @@ class IdToObjectMap
 
     bool add(ObjectId id, JSObject* obj);
     JSObject* find(ObjectId id);
+	JSObject* findPreserveColor(ObjectId id);
     void remove(ObjectId id);
 
     void clear();
@@ -233,4 +234,4 @@ class JavaScriptShared : public CPOWManager
 } // namespace jsipc
 } // namespace mozilla
 
-#endif
+#endif
\ No newline at end of file
diff --git a/js/ipc/WrapperAnswer.cpp b/js/ipc/WrapperAnswer.cpp
index fc342bbb6..6ae68e01f 100644
--- a/js/ipc/WrapperAnswer.cpp
+++ b/js/ipc/WrapperAnswer.cpp
@@ -789,10 +789,10 @@ WrapperAnswer::RecvDOMInstanceOf(const ObjectId& objId, const int& prototypeID,
 bool
 WrapperAnswer::RecvDropObject(const ObjectId& objId)
 {
-    JSObject* obj = objects_.find(objId);
+    JSObject* obj = objects_.findPreserveColor(objId);
     if (obj) {
         objectIdMap(objId.hasXrayWaiver()).remove(obj);
         objects_.remove(objId);
     }
     return true;
-}
+}
\ No newline at end of file
-- 
cgit v1.2.3