[INFER] Fix more build breaks, bug 619271.
authorBrian Hackett <bhackett1024@gmail.com>
Sun, 19 Dec 2010 08:15:24 -0800
changeset 74667 400807801eb7c54ed72228f4ab904264e05dcd32
parent 74666 f0eec3cc4f4541fcbd4425b48f5c32af393cfc78
child 74668 19c7bedfe2332d9d7a2c7b6d990059623f80b49f
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
bugs619271
milestone2.0b8pre
[INFER] Fix more build breaks, bug 619271.
dom/base/nsDOMClassInfo.cpp
--- a/dom/base/nsDOMClassInfo.cpp
+++ b/dom/base/nsDOMClassInfo.cpp
@@ -6951,17 +6951,17 @@ nsWindowSH::NewResolve(nsIXPConnectWrapp
   // defined on our prototype chain. This way we can access this
   // expando w/o ever getting back into XPConnect.
   if ((flags & JSRESOLVE_ASSIGNING) && !(flags & JSRESOLVE_WITH) &&
       win->IsInnerWindow()) {
     JSObject *realObj;
     wrapper->GetJSObject(&realObj);
 
     if (obj == realObj) {
-      JSObject *proto = obj->getProto();
+      JSObject *proto = JS_GetPrototype(cx, obj);
       if (proto) {
         JSObject *pobj = NULL;
         jsval val;
 
         if (!::JS_LookupPropertyWithFlagsById(cx, proto, id, flags,
                                               &pobj, &val)) {
           *_retval = JS_FALSE;
 
@@ -8647,17 +8647,17 @@ nsHTMLDocumentSH::DocumentAllGetProperty
   // newResolve hook, so nothing to do for those properties here. And
   // we need to return early to prevent <div id="item"> from shadowing
   // document.all.item(), etc.
   if (id == sItem_id || id == sNamedItem_id) {
     return JS_TRUE;
   }
 
   while (obj->getJSClass() != &sHTMLDocumentAllClass) {
-    obj = obj->getProto();
+    obj = JS_GetPrototype(cx, obj);
 
     if (!obj) {
       NS_ERROR("The JS engine lies!");
 
       return JS_TRUE;
     }
   }