commit 9fd106630afcfc799d1f7d301e19935ee431681e
author David Ghandehari <iffy@google.com> Wed Feb 01 17:59:14 2017 -0800
committer David Ghandehari <iffy@google.com> Wed Feb 01 17:59:14 2017 -0800
tree 5441236ad9afa8eb6dc1d1ace79968d7d7751448
parent c2b4089af4280a65cc5e5818847e3a9a8662c215

Import Cobalt 8.20698

src/cobalt/script/mozjs-45/wrapper_factory.cc

diff --git a/src/cobalt/script/mozjs-45/wrapper_factory.cc b/src/cobalt/script/mozjs-45/wrapper_factory.cc
index d533458..ce94c3c 100644
--- a/src/cobalt/script/mozjs-45/wrapper_factory.cc
+++ b/src/cobalt/script/mozjs-45/wrapper_factory.cc
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "cobalt/script/mozjs/wrapper_factory.h"
+#include "cobalt/script/mozjs-45/wrapper_factory.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
-#include "cobalt/script/mozjs/mozjs_wrapper_handle.h"
-#include "cobalt/script/mozjs/wrapper_private.h"
-#include "third_party/mozjs/js/src/jsproxy.h"
+#include "cobalt/script/mozjs-45/mozjs_wrapper_handle.h"
+#include "cobalt/script/mozjs-45/wrapper_private.h"
+#include "third_party/mozjs-45/js/public/Proxy.h"
 
 namespace cobalt {
 namespace script {
@@ -95,16 +95,15 @@
   }
   const JSClass* proto_class = it->second.prototype_class.Run(context_);
   JS::RootedObject object_proto_object(context_);
-  bool success =
-      JS_GetPrototype(context_, object, object_proto_object.address());
+  bool success = JS_GetPrototype(context_, object, &object_proto_object);
   bool equality = false;
   while (!equality && success && object_proto_object) {
     // Get the class of the prototype.
-    JSClass* object_proto_class = JS_GetClass(object_proto_object);
+    const JSClass* object_proto_class = JS_GetClass(object_proto_object);
     equality = (object_proto_class == proto_class);
     // Get the prototype of the previous prototype.
-    success = JS_GetPrototype(context_, object_proto_object,
-                              object_proto_object.address());
+    success =
+        JS_GetPrototype(context_, object_proto_object, &object_proto_object);
   }
   return equality;
 }