corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backout bug 684110 (08b6eaf6aad0, cf8b35fa1010, 25ee45edabe1, 659f5c7d2cc9, 870f6dd82586 & e1ad65d6a7fd) and bug 684344 (cd1957f6628d) on a CLOSED TREE; a=bustage-fairies

Browse Source
This commit is contained in:
Ed Morley
2011-09-03 03:21:25 +01:00
parent cb5431e87b
commit ee57bf1d01
75 changed files with 1010 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsdate.cpp
View File

@@ -503,7 +503,7 @@ date_convert(JSContext *cx, JSObject *obj, JSType hint, Value *vp)
* Other Support routines and definitions
*/
Class js::DateClass = {
Class js_DateClass = {
js_Date_str,
JSCLASS_HAS_RESERVED_SLOTS(JSObject::DATE_CLASS_RESERVED_SLOTS) |
JSCLASS_HAS_CACHED_PROTO(JSProto_Date),
@@ -1226,7 +1226,7 @@ GetUTCTime(JSContext *cx, JSObject *obj, Value *vp, jsdouble *dp)
{
if (!obj->isDate()) {
if (vp)
ReportIncompatibleMethod(cx, vp, &DateClass);
ReportIncompatibleMethod(cx, vp, &js_DateClass);
return false;
}
*dp = obj->getDateUTCTime().toNumber();
@@ -1408,7 +1408,7 @@ GetAndCacheLocalTime(JSContext *cx, JSObject *obj, Value *vp, jsdouble *time = N
return false;
if (!obj->isDate()) {
if (vp)
ReportIncompatibleMethod(cx, vp, &DateClass);
ReportIncompatibleMethod(cx, vp, &js_DateClass);
return false;
}
@@ -1701,7 +1701,7 @@ date_setTime(JSContext *cx, uintN argc, Value *vp)
return false;
if (!obj->isDate()) {
ReportIncompatibleMethod(cx, vp, &DateClass);
ReportIncompatibleMethod(cx, vp, &js_DateClass);
return false;
}
@@ -2607,7 +2607,7 @@ js_InitDateClass(JSContext *cx, JSObject *obj)
{
/* set static LocalTZA */
LocalTZA = -(PRMJ_LocalGMTDifference() * msPerSecond);
JSObject *proto = js_InitClass(cx, obj, NULL, &DateClass, js_Date, MAXARGS,
JSObject *proto = js_InitClass(cx, obj, NULL, &js_DateClass, js_Date, MAXARGS,
NULL, date_methods, NULL, date_static_methods);
if (!proto)
return NULL;
@@ -2638,7 +2638,7 @@ js_InitDateClass(JSContext *cx, JSObject *obj)
JS_FRIEND_API(JSObject *)
js_NewDateObjectMsec(JSContext *cx, jsdouble msec_time)
{
JSObject *obj = NewBuiltinClassInstance(cx, &DateClass);
JSObject *obj = NewBuiltinClassInstance(cx, &js_DateClass);
if (!obj || !obj->ensureSlots(cx, JSObject::DATE_CLASS_RESERVED_SLOTS))
return NULL;
if (!SetUTCTime(cx, obj, msec_time))