bindings: Use Maybe APIs in V8ScriptRunner (part 1)

Source/bindings/core/v8/custom/V8InjectedScriptHostCustom.cpp

 /*
  * Copyright (C) 2007-2011 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 360 matching lines @@
     }
 
     v8::Handle<v8::String> expression = info[0]->ToString(isolate);
     if (expression.IsEmpty()) {
         isolate->ThrowException(v8::Exception::Error(v8::String::NewFromUtf8(isolate, "The argument must be a string.")));
         return;
     }
 
     ASSERT(isolate->InContext());
     v8::TryCatch tryCatch;
-    v8::Handle<v8::Value> result = V8ScriptRunner::compileAndRunInternalScript(expression, info.GetIsolate());
-    if (tryCatch.HasCaught()) {
-        v8SetReturnValue(info, tryCatch.ReThrow());
+    v8::Local<v8::Value> result;
+    if (!V8ScriptRunner::compileAndRunInternalScript(expression, info.GetIsolate()).ToLocal(&result)) {
+        if (tryCatch.HasCaught())

[dcarney, 2015/03/13 08:15:46]

use a macro for this pattern

[bashi, 2015/03/17 02:01:36]

Done.

+            v8SetReturnValue(info, tryCatch.ReThrow());
         return;
     }
     v8SetReturnValue(info, result);
 }
 
 void V8InjectedScriptHost::evaluateWithExceptionDetailsMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     v8::Isolate* isolate = info.GetIsolate();
     if (info.Length() < 1) {
         isolate->ThrowException(v8::Exception::Error(v8::String::NewFromUtf8(isolate, "One argument expected.")));
         return;
     }
 
     v8::Handle<v8::String> expression = info[0]->ToString(isolate);
     if (expression.IsEmpty()) {
         isolate->ThrowException(v8::Exception::Error(v8::String::NewFromUtf8(isolate, "The argument must be a string.")));
         return;
     }
 
     ASSERT(isolate->InContext());
     v8::TryCatch tryCatch;
-    v8::Handle<v8::Script> script = V8ScriptRunner::compileScript(expression, String(), String(), TextPosition(), isolate);
-    v8::Handle<v8::Value> result = V8ScriptRunner::runCompiledScript(isolate, script, currentExecutionContext(isolate));
+    v8::Local<v8::Script> script;
+    v8::MaybeLocal<v8::Value> result;
+    if (V8ScriptRunner::compileScript(expression, String(), String(), TextPosition(), isolate).ToLocal(&script))
+        result = V8ScriptRunner::runCompiledScript(isolate, script, currentExecutionContext(isolate));
 
+    if (!tryCatch.CanContinue())
+        return;
     v8::Local<v8::Object> wrappedResult = v8::Object::New(isolate);
     if (tryCatch.HasCaught()) {
         wrappedResult->Set(v8::String::NewFromUtf8(isolate, "result"), tryCatch.Exception());
         wrappedResult->Set(v8::String::NewFromUtf8(isolate, "exceptionDetails"), JavaScriptCallFrame::createExceptionDetails(isolate, tryCatch.Message()));
     } else {
-        wrappedResult->Set(v8::String::NewFromUtf8(isolate, "result"), result);
+        ASSERT(!result.IsEmpty());
+        wrappedResult->Set(v8::String::NewFromUtf8(isolate, "result"), result.ToLocalChecked());
         wrappedResult->Set(v8::String::NewFromUtf8(isolate, "exceptionDetails"), v8::Undefined(isolate));
     }
     v8SetReturnValue(info, wrappedResult);
 }
 
 void V8InjectedScriptHost::setFunctionVariableValueMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     if (info.Length() < 4 || !info[0]->IsFunction() || !info[1]->IsInt32() || !info[2]->IsString())
         return;
 
@@ skipping 161 matching lines @@
     InjectedScriptNative* injectedScriptNative = InjectedScriptNative::fromInjectedScriptHost(info.Holder());
     if (!injectedScriptNative)
         return;
     int id = info[0]->ToInt32(info.GetIsolate())->Value();
     String groupName = injectedScriptNative->groupName(id);
     if (!groupName.isEmpty())
         info.GetReturnValue().Set(v8String(info.GetIsolate(), groupName));
 }
 
 } // namespace blink