Merge MC -> JM.

This commit is contained in:
Brian Hackett
2011-07-28 18:10:31 -07:00
1127 changed files with 251667 additions and 15562 deletions

View File

@@ -552,9 +552,8 @@ date_regionMatches(const char* s1, int s1off, const jschar* s2, int s2off,
while (count > 0 && s1[s1off] && s2[s2off]) {
if (ignoreCase) {
if (JS_TOLOWER((jschar)s1[s1off]) != JS_TOLOWER(s2[s2off])) {
if (unicode::ToLowerCase(s1[s1off]) != unicode::ToLowerCase(s2[s2off]))
break;
}
} else {
if ((jschar)s1[s1off] != s2[s2off]) {
break;
@@ -1244,7 +1243,7 @@ SetUTCTime(JSContext *cx, JSObject *obj, jsdouble t, Value *vp = NULL)
size_t slotCap = JS_MIN(obj->numSlots(), JSObject::DATE_CLASS_RESERVED_SLOTS);
for (size_t ind = JSObject::JSSLOT_DATE_COMPONENTS_START; ind < slotCap; ind++)
obj->getSlotRef(ind).setUndefined();
obj->setSlot(ind, UndefinedValue());
obj->setDateUTCTime(DoubleValue(t));
if (vp)