Backed out changeset ac1ae4224375 (Bug 1298773) for JP failures on a CLOSED TREE.
authorTerrence Cole <terrence@mozilla.com>
Fri, 23 Sep 2016 10:58:56 -0700
changeset 315191 526f72b839de022ad2e7f49951c72f841c4945d0
parent 315190 c684f2f380767b95585e0daf0d88a412a1a674d3
child 315192 eb314c69ae72f4f0020c007c04e11f0eba6abe8d
push id32563
push userihsiao@mozilla.com
push dateMon, 26 Sep 2016 11:18:33 +0000
treeherderautoland@eb840c87b5fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1298773
milestone52.0a1
backs outac1ae4224375da1de66ddf78658fe49fd972486f
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset ac1ae4224375 (Bug 1298773) for JP failures on a CLOSED TREE.
js/src/proxy/Wrapper.cpp
--- a/js/src/proxy/Wrapper.cpp
+++ b/js/src/proxy/Wrapper.cpp
@@ -324,20 +324,17 @@ Wrapper::wrapperHandler(JSObject* wrappe
     MOZ_ASSERT(wrapper->is<WrapperObject>());
     return static_cast<const Wrapper*>(wrapper->as<ProxyObject>().handler());
 }
 
 JSObject*
 Wrapper::wrappedObject(JSObject* wrapper)
 {
     MOZ_ASSERT(wrapper->is<WrapperObject>());
-    JSObject* target = wrapper->as<ProxyObject>().target();
-    if (target)
-        JS::ExposeObjectToActiveJS(target);
-    return target;
+    return wrapper->as<ProxyObject>().target();
 }
 
 JS_FRIEND_API(JSObject*)
 js::UncheckedUnwrap(JSObject* wrapped, bool stopAtWindowProxy, unsigned* flagsp)
 {
     unsigned flags = 0;
     while (true) {
         if (!wrapped->is<WrapperObject>() ||