Bug 1042436 - Lowercase the "reason" param to SilentFailure. a=sledru
💩💩 backed out by 53c7aceaf1a8 💩 💩
authorBobby Holley <bobbyholley@gmail.com>
Wed, 06 Aug 2014 23:32:22 -0400
changeset 208274 4cb373d9ce33
parent 208273 6037db66624b
child 208275 1cf7b5810eb5
push id3796
push userryanvm@gmail.com
push date2014-08-08 18:52 +0000
treeherdermozilla-beta@1cf7b5810eb5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssledru
bugs1042436
milestone32.0
Bug 1042436 - Lowercase the "reason" param to SilentFailure. a=sledru
js/xpconnect/wrappers/XrayWrapper.cpp
--- a/js/xpconnect/wrappers/XrayWrapper.cpp
+++ b/js/xpconnect/wrappers/XrayWrapper.cpp
@@ -448,28 +448,28 @@ bool JSXrayTraits::getOwnPropertyFromTar
 
     // If the property doesn't exist at all, we're done.
     if (!desc.object())
         return true;
 
     // Disallow accessor properties.
     if (desc.hasGetterOrSetter()) {
         JSAutoCompartment ac(cx, wrapper);
-        return SilentFailure(cx, id, "Property has accessor");
+        return SilentFailure(cx, id, "property has accessor");
     }
 
     // Apply extra scrutiny to objects.
     if (desc.value().isObject()) {
         RootedObject propObj(cx, js::UncheckedUnwrap(&desc.value().toObject()));
         JSAutoCompartment ac(cx, propObj);
 
         // Disallow non-subsumed objects.
         if (!AccessCheck::subsumes(target, propObj)) {
             JSAutoCompartment ac(cx, wrapper);
-            return SilentFailure(cx, id, "Value not same-origin with target");
+            return SilentFailure(cx, id, "value not same-origin with target");
         }
 
         // Disallow non-Xrayable objects.
         if (GetXrayType(propObj) == NotXray) {
             // Note - We're going add Xrays for Arrays/TypedArrays soon in
             // bug 987163, so we don't want to cause unnecessary compat churn
             // by making xrayedObj.arrayProp stop working temporarily, and then
             // start working again. At the same time, this is an important check,
@@ -479,39 +479,39 @@ bool JSXrayTraits::getOwnPropertyFromTar
             JSProtoKey key = IdentifyStandardInstanceOrPrototype(propObj);
             if (key != JSProto_Uint8ClampedArray &&
                 key != JSProto_Int8Array && key != JSProto_Uint8Array &&
                 key != JSProto_Int16Array && key != JSProto_Uint16Array &&
                 key != JSProto_Int32Array && key != JSProto_Uint32Array &&
                 key != JSProto_Float32Array && key != JSProto_Float64Array)
             {
                 JSAutoCompartment ac(cx, wrapper);
-                return SilentFailure(cx, id, "Value not Xrayable");
+                return SilentFailure(cx, id, "value not Xrayable");
             }
         }
 
         // Disallow callables.
         if (JS_ObjectIsCallable(cx, propObj)) {
             JSAutoCompartment ac(cx, wrapper);
-            return SilentFailure(cx, id, "Value is callable");
+            return SilentFailure(cx, id, "value is callable");
         }
     }
 
     // Disallow any property that shadows something on its (Xrayed)
     // prototype chain.
     JSAutoCompartment ac2(cx, wrapper);
     RootedObject proto(cx);
     bool foundOnProto = false;
     if (!JS_GetPrototype(cx, wrapper, &proto) ||
         (proto && !JS_HasPropertyById(cx, proto, id, &foundOnProto)))
     {
         return false;
     }
     if (foundOnProto)
-        return SilentFailure(cx, id, "Value shadows a property on the standard prototype");
+        return SilentFailure(cx, id, "value shadows a property on the standard prototype");
 
     // We made it! Assign over the descriptor, and don't forget to wrap.
     outDesc.assign(desc.get());
     return true;
 }
 
 bool
 JSXrayTraits::resolveOwnProperty(JSContext *cx, Wrapper &jsWrapper,