Bug 1324330 (part 3) - Don't mix |Cant| and |Cannot| in function names in XPCWrappedNativeJSOps.cpp. r=mccr8.
authorNicholas Nethercote <nnethercote@mozilla.com>
Fri, 23 Dec 2016 08:30:27 +1100
changeset 328514 a193a2da927441688192f9ee07db640e51d0120b
parent 328513 5b05e5a264b4a5e8e8aabdcf7198bf541f618cb4
child 328515 3a2066a8e8a822217907a86b0c10227a9214557d
push id31175
push usercbook@mozilla.com
push dateMon, 09 Jan 2017 09:33:22 +0000
treeherdermozilla-central@701868bfddcb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1324330
milestone53.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
Bug 1324330 (part 3) - Don't mix |Cant| and |Cannot| in function names in XPCWrappedNativeJSOps.cpp. r=mccr8. Use |Cannot| consistently.
js/xpconnect/public/xpc_make_class.h
js/xpconnect/src/XPCWrappedNativeJSOps.cpp
--- a/js/xpconnect/public/xpc_make_class.h
+++ b/js/xpconnect/public/xpc_make_class.h
@@ -20,18 +20,18 @@ bool
 XPC_WN_CannotModifyPropertyStub(JSContext* cx, JS::HandleObject obj,
                                 JS::HandleId id, JS::HandleValue v);
 
 bool
 XPC_WN_MaybeResolvingDeletePropertyStub(JSContext* cx, JS::HandleObject obj,
                                         JS::HandleId id,
                                         JS::ObjectOpResult& result);
 bool
-XPC_WN_CantDeletePropertyStub(JSContext* cx, JS::HandleObject obj,
-                              JS::HandleId id, JS::ObjectOpResult& result);
+XPC_WN_CannotDeletePropertyStub(JSContext* cx, JS::HandleObject obj,
+                                JS::HandleId id, JS::ObjectOpResult& result);
 
 bool
 XPC_WN_Helper_GetProperty(JSContext* cx, JS::HandleObject obj, JS::HandleId id,
                           JS::MutableHandleValue vp);
 
 bool
 XPC_WN_Helper_SetProperty(JSContext* cx, JS::HandleObject obj, JS::HandleId id,
                           JS::MutableHandleValue vp,
@@ -84,17 +84,17 @@ extern const js::ObjectOps XPC_WN_Object
       ? XPC_WN_MaybeResolvingPropertyStub \
       : XPC_WN_CannotModifyPropertyStub, \
     \
     /* delProperty */ \
     ((_flags) & nsIXPCScriptable::USE_JSSTUB_FOR_DELPROPERTY) \
     ? nullptr \
     : ((_flags) & nsIXPCScriptable::ALLOW_PROP_MODS_DURING_RESOLVE) \
       ? XPC_WN_MaybeResolvingDeletePropertyStub \
-      : XPC_WN_CantDeletePropertyStub, \
+      : XPC_WN_CannotDeletePropertyStub, \
     \
     /* getProperty */ \
     ((_flags) & nsIXPCScriptable::WANT_GETPROPERTY) \
     ? XPC_WN_Helper_GetProperty \
     : nullptr, \
     \
     /* setProperty */ \
     ((_flags) & nsIXPCScriptable::WANT_SETPROPERTY) \
--- a/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeJSOps.cpp
@@ -474,18 +474,18 @@ XPC_WN_OnlyIWrite_AddPropertyStub(JSCont
 bool
 XPC_WN_CannotModifyPropertyStub(JSContext* cx, HandleObject obj, HandleId id,
                                 HandleValue v)
 {
     return Throw(NS_ERROR_XPC_CANT_MODIFY_PROP_ON_WN, cx);
 }
 
 bool
-XPC_WN_CantDeletePropertyStub(JSContext* cx, HandleObject obj, HandleId id,
-                              ObjectOpResult& result)
+XPC_WN_CannotDeletePropertyStub(JSContext* cx, HandleObject obj, HandleId id,
+                                ObjectOpResult& result)
 {
     return Throw(NS_ERROR_XPC_CANT_MODIFY_PROP_ON_WN, cx);
 }
 
 bool
 XPC_WN_CannotModifySetPropertyStub(JSContext* cx, HandleObject obj, HandleId id,
                                    MutableHandleValue vp, ObjectOpResult& result)
 {
@@ -619,17 +619,17 @@ XPC_WN_NoHelper_Resolve(JSContext* cx, H
                                  JSPROP_ENUMERATE |
                                  JSPROP_READONLY |
                                  JSPROP_PERMANENT,
                                  resolvedp);
 }
 
 static const js::ClassOps XPC_WN_NoHelper_JSClassOps = {
     XPC_WN_OnlyIWrite_AddPropertyStub, // addProperty
-    XPC_WN_CantDeletePropertyStub,     // delProperty
+    XPC_WN_CannotDeletePropertyStub,   // delProperty
     nullptr,                           // getProperty
     nullptr,                           // setProperty
     XPC_WN_Shared_Enumerate,           // enumerate
     XPC_WN_NoHelper_Resolve,           // resolve
     nullptr,                           // mayResolve
     XPC_WN_NoHelper_Finalize,          // finalize
     nullptr,                           // call
     nullptr,                           // construct
@@ -1201,17 +1201,17 @@ XPC_WN_NoMods_Proto_Resolve(JSContext* c
                                  true, nullptr, nullptr, si,
                                  JSPROP_READONLY |
                                  JSPROP_PERMANENT |
                                  JSPROP_ENUMERATE, resolvedp);
 }
 
 static const js::ClassOps XPC_WN_NoMods_Proto_JSClassOps = {
     XPC_WN_OnlyIWrite_Proto_AddPropertyStub,   // addProperty
-    XPC_WN_CantDeletePropertyStub,             // delProperty
+    XPC_WN_CannotDeletePropertyStub,           // delProperty
     nullptr,                                   // getProperty
     nullptr,                                   // setProperty
     XPC_WN_Shared_Proto_Enumerate,             // enumerate
     XPC_WN_NoMods_Proto_Resolve,               // resolve
     nullptr,                                   // mayResolve
     XPC_WN_Shared_Proto_Finalize,              // finalize
     nullptr,                                   // call
     nullptr,                                   // construct
@@ -1297,17 +1297,17 @@ XPC_WN_TearOff_ObjectMoved(JSObject* obj
 // XPC_WN_TEAROFF_RESERVED_SLOTS value is OK.
 
 static_assert(((XPC_WRAPPER_FLAGS >> JSCLASS_RESERVED_SLOTS_SHIFT) &
                JSCLASS_RESERVED_SLOTS_MASK) == 0,
               "XPC_WRAPPER_FLAGS should not include any reserved slots");
 
 static const js::ClassOps XPC_WN_Tearoff_JSClassOps = {
     XPC_WN_OnlyIWrite_AddPropertyStub,  // addProperty
-    XPC_WN_CantDeletePropertyStub,      // delProperty
+    XPC_WN_CannotDeletePropertyStub,    // delProperty
     nullptr,                            // getProperty
     nullptr,                            // setProperty
     XPC_WN_TearOff_Enumerate,           // enumerate
     XPC_WN_TearOff_Resolve,             // resolve
     nullptr,                            // mayResolve
     XPC_WN_TearOff_Finalize,            // finalize
     nullptr,                            // call
     nullptr,                            // construct