Backed out changeset 2c6403818106 (bug 1027402) for bustage on a CLOSED TREE

2014-06-27 14:21:46 +02:00
parent 026215908a
commit 226c1ea9df
7 changed files with 29 additions and 27 deletions
--- a/js/src/jsproxy.cpp
+++ b/js/src/jsproxy.cpp
@@ -79,10 +79,10 @@ js::assertEnteredPolicy(JSContext *cx, JSObject *proxy, jsid id,
 }
 #endif

-BaseProxyHandler::BaseProxyHandler(const void *family, bool hasPrototype, bool hasSecurityPolicy)
+BaseProxyHandler::BaseProxyHandler(const void *family)
  : mFamily(family),
-    mHasPrototype(hasPrototype),
-    mHasSecurityPolicy(hasSecurityPolicy)
+    mHasPrototype(false),
+    mHasSecurityPolicy(false)
 {
 }

@@ -538,9 +538,8 @@ DirectProxyHandler::weakmapKeyDelegate(JSObject *proxy)
    return UncheckedUnwrap(proxy);
 }

-DirectProxyHandler::DirectProxyHandler(const void *family, bool hasPrototype,
-                                       bool hasSecurityPolicy)
-  : BaseProxyHandler(family, hasPrototype, hasSecurityPolicy)
+DirectProxyHandler::DirectProxyHandler(const void *family)
+  : BaseProxyHandler(family)
 {
 }