Merge m-c to birch.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 07 Jun 2013 11:34:26 -0400
changeset 145857 8e7a612cc23214d4881c28c19e69fe347ccb6827
parent 145856 47aba2f7bd778f111b1f7a3540e767b54de849dc (current diff)
parent 145853 6cafe68983ca4945a7d50bda6b345b3522c4c5d3 (diff)
child 145858 952393b787bf236f0ed88f34af47f6d2805dd578
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone24.0a1
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
Merge m-c to birch.
--- a/dom/bindings/DOMJSProxyHandler.cpp
+++ b/dom/bindings/DOMJSProxyHandler.cpp
@@ -58,17 +58,17 @@ DOMProxyShadows(JSContext* cx, JSHandleO
   return hasOwn ? js::Shadows : js::DoesntShadowUnique;
 }
 
 // Store the information for the specialized ICs.
 struct SetDOMProxyInformation
 {
   SetDOMProxyInformation() {
     js::SetDOMProxyInformation((void*) &HandlerFamily,
-                               js::JSSLOT_PROXY_EXTRA + JSPROXYSLOT_EXPANDO, DOMProxyShadow);
+                               js::JSSLOT_PROXY_EXTRA + JSPROXYSLOT_EXPANDO, DOMProxyShadows);
   }
 };
 
 SetDOMProxyInformation gSetDOMProxyInformation;
 
 // static
 JSObject*
 DOMProxyHandler::GetAndClearExpandoObject(JSObject* obj)