bindings: Use Maybe version of Get in bindings/

Source/bindings/core/v8/V8PerContextData.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 22 matching lines @@
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8ObjectConstructor.h"
 #include "wtf/StringExtras.h"
 
 #include <stdlib.h>
 
 namespace blink {
 
-V8PerContextData::V8PerContextData(v8::Handle<v8::Context> context)
+V8PerContextData::V8PerContextData(v8::Local<v8::Context> context)
     : m_isolate(context->GetIsolate())
     , m_wrapperBoilerplates(m_isolate)
     , m_constructorMap(m_isolate)
     , m_contextHolder(adoptPtr(new gin::ContextHolder(m_isolate)))
     , m_context(m_isolate, context)
     , m_activityLogger(0)
     , m_compiledPrivateScript(m_isolate)
 {
     m_contextHolder->SetContext(context);
 
     v8::Context::Scope contextScope(context);
     ASSERT(m_errorPrototype.isEmpty());
-    v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(context->Global()->Get(v8AtomicString(m_isolate, "Error")));
-    ASSERT(!object.IsEmpty());
-    v8::Handle<v8::Value> prototypeValue = object->Get(v8AtomicString(m_isolate, "prototype"));
-    ASSERT(!prototypeValue.IsEmpty());
+    v8::Local<v8::Value> objectValue = context->Global()->Get(context, v8AtomicString(m_isolate, "Error")).ToLocalChecked();
+    ASSERT(objectValue->IsObject());

[haraken, 2015/04/07 08:56:43]

This ASSERT won't be needed, since the following As has the check.

[bashi, 2015/04/07 09:37:31]

Removed.

+    v8::Local<v8::Value> prototypeValue = objectValue.As<v8::Object>()->Get(context, v8AtomicString(m_isolate, "prototype")).ToLocalChecked();
     m_errorPrototype.set(m_isolate, prototypeValue);
 }
 
 V8PerContextData::~V8PerContextData()
 {
 }
 
-PassOwnPtr<V8PerContextData> V8PerContextData::create(v8::Handle<v8::Context> context)
+PassOwnPtr<V8PerContextData> V8PerContextData::create(v8::Local<v8::Context> context)
 {
     return adoptPtr(new V8PerContextData(context));
 }
 
-V8PerContextData* V8PerContextData::from(v8::Handle<v8::Context> context)
+V8PerContextData* V8PerContextData::from(v8::Local<v8::Context> context)
 {
     return ScriptState::from(context)->perContextData();
 }
 
 v8::Local<v8::Object> V8PerContextData::createWrapperFromCacheSlowCase(const WrapperTypeInfo* type)
 {
     ASSERT(!m_errorPrototype.isEmpty());
 
     v8::Context::Scope scope(context());
     v8::Local<v8::Function> function = constructorForType(type);
@@ skipping 21 matching lines @@
         return v8::Local<v8::Function>();
 
     if (type->parentClass) {
         v8::Local<v8::Object> prototypeTemplate = constructorForType(type->parentClass);
         if (prototypeTemplate.IsEmpty())
             return v8::Local<v8::Function>();
         if (!v8CallBoolean(function->SetPrototype(currentContext, prototypeTemplate)))
             return v8::Local<v8::Function>();
     }
 
-    v8::Local<v8::Value> prototypeValue = function->Get(v8AtomicString(m_isolate, "prototype"));
-    if (!prototypeValue.IsEmpty() && prototypeValue->IsObject()) {
+    v8::Local<v8::Value> prototypeValue;
+    if (function->Get(currentContext, v8AtomicString(m_isolate, "prototype")).ToLocal(&prototypeValue) && prototypeValue->IsObject()) {

[bashi, 2015/04/07 09:37:31]

Chatted offline and we think it would be better to crash than returning a
half-baked function object.

         v8::Local<v8::Object> prototypeObject = v8::Local<v8::Object>::Cast(prototypeValue);
         if (prototypeObject->InternalFieldCount() == v8PrototypeInternalFieldcount
             && type->wrapperTypePrototype == WrapperTypeInfo::WrapperTypeObjectPrototype)
             prototypeObject->SetAlignedPointerInInternalField(v8PrototypeTypeIndex, const_cast<WrapperTypeInfo*>(type));
         type->installConditionallyEnabledMethods(prototypeObject, m_isolate);
         if (type->wrapperTypePrototype == WrapperTypeInfo::WrapperTypeExceptionPrototype) {
             if (!v8CallBoolean(prototypeObject->SetPrototype(currentContext, m_errorPrototype.newLocal(m_isolate))))
                 return v8::Local<v8::Function>();

[bashi, 2015/04/07 09:37:31]

This would also be RELEASE_ASSERT_NOT_REACHED(), but I'd like to do that in a
follow-up CL.

         }
     }
 
     m_constructorMap.Set(type, function);
 
     return function;
 }
 
 v8::Local<v8::Object> V8PerContextData::prototypeForType(const WrapperTypeInfo* type)
 {
     v8::Local<v8::Object> constructor = constructorForType(type);
     if (constructor.IsEmpty())
         return v8::Local<v8::Object>();
-    return constructor->Get(v8String(m_isolate, "prototype")).As<v8::Object>();
+    v8::Local<v8::Value> prototypeValue;
+    if (!constructor->Get(context(), v8String(m_isolate, "prototype")).ToLocal(&prototypeValue) || !prototypeValue->IsObject())
+        return v8::Local<v8::Object>();
+    return prototypeValue.As<v8::Object>();
 }
 
 void V8PerContextData::addCustomElementBinding(CustomElementDefinition* definition, PassOwnPtr<CustomElementBinding> binding)
 {
     m_customElementBindings.append(binding);
 }
 
 v8::Handle<v8::Value> V8PerContextData::compiledPrivateScript(String className)
 {
     return m_compiledPrivateScript.Get(className);
 }
 
 void V8PerContextData::setCompiledPrivateScript(String className, v8::Handle<v8::Value> compiledObject)
 {
     m_compiledPrivateScript.Set(className, compiledObject);
 }
 
 } // namespace blink