bindings: Use Maybe APIs in V8ScriptRunner (part 1)

Source/bindings/core/v8/ScriptDebugServer.cpp

 /*
  * Copyright (c) 2010-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 596 matching lines @@
 
 void ScriptDebugServer::ensureDebuggerScriptCompiled()
 {
     if (!m_debuggerScript.IsEmpty())
         return;
 
     v8::HandleScope scope(m_isolate);
     v8::Context::Scope contextScope(v8::Debug::GetDebugContext());
     const blink::WebData& debuggerScriptSourceResource = blink::Platform::current()->loadResource("DebuggerScriptSource.js");
     v8::Handle<v8::String> source = v8String(m_isolate, String(debuggerScriptSourceResource.data(), debuggerScriptSourceResource.size()));
-    v8::Local<v8::Value> value = V8ScriptRunner::compileAndRunInternalScript(source, m_isolate);
-    ASSERT(!value.IsEmpty());
+    v8::Local<v8::Value> value;
+    if (!V8ScriptRunner::compileAndRunInternalScript(source, m_isolate).ToLocal(&value))
+        ASSERT_NOT_REACHED();

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

In cases like this you want ToLocalChecked instead

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

Done. Please add DCHECK() in ToLocalChecked.

     ASSERT(value->IsObject());
     m_debuggerScript.Reset(m_isolate, v8::Handle<v8::Object>::Cast(value));
 }
 
 void ScriptDebugServer::discardDebuggerScript()
 {
     ASSERT(!m_debuggerScript.IsEmpty());
     m_debuggerScript.Reset();
 }
 
@@ skipping 61 matching lines @@
 }
 
 void ScriptDebugServer::compileScript(ScriptState* scriptState, const String& expression, const String& sourceURL, bool persistScript, String* scriptId, String* exceptionDetailsText, int* lineNumber, int* columnNumber, RefPtrWillBeRawPtr<ScriptCallStack>* stackTrace)
 {
     if (!scriptState->contextIsValid())
         return;
     ScriptState::Scope scope(scriptState);
 
     v8::Handle<v8::String> source = v8String(m_isolate, expression);
     v8::TryCatch tryCatch;
-    v8::Local<v8::Script> script = V8ScriptRunner::compileScript(source, sourceURL, String(), TextPosition(), m_isolate);
-    if (tryCatch.HasCaught()) {
-        v8::Local<v8::Message> message = tryCatch.Message();
-        if (!message.IsEmpty()) {
-            *exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message->Get());
-            *lineNumber = message->GetLineNumber();
-            *columnNumber = message->GetStartColumn();
-            v8::Handle<v8::StackTrace> messageStackTrace = message->GetStackTrace();
-            if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0)
-                *stackTrace = createScriptCallStack(m_isolate, messageStackTrace, messageStackTrace->GetFrameCount());
+    v8::Local<v8::Script> script;
+    if (!V8ScriptRunner::compileScript(source, sourceURL, String(), TextPosition(), m_isolate).ToLocal(&script)) {
+        if (tryCatch.HasCaught()) {
+            v8::Local<v8::Message> message = tryCatch.Message();
+            if (!message.IsEmpty()) {
+                *exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message->Get());
+                *lineNumber = message->GetLineNumber();
+                *columnNumber = message->GetStartColumn();
+                v8::Handle<v8::StackTrace> messageStackTrace = message->GetStackTrace();
+                if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0)
+                    *stackTrace = createScriptCallStack(m_isolate, messageStackTrace, messageStackTrace->GetFrameCount());
+            }
         }
         return;
     }
-    if (script.IsEmpty() || !persistScript)
+    if (!persistScript)
         return;
 
     *scriptId = String::number(script->GetUnboundScript()->GetId());
     m_compiledScripts.Set(*scriptId, script);
 }
 
 void ScriptDebugServer::clearCompiledScripts()
 {
     m_compiledScripts.Clear();
 }
 
 void ScriptDebugServer::runScript(ScriptState* scriptState, const String& scriptId, ScriptValue* result, bool* wasThrown, String* exceptionDetailsText, int* lineNumber, int* columnNumber, RefPtrWillBeRawPtr<ScriptCallStack>* stackTrace)
 {
     if (!m_compiledScripts.Contains(scriptId))
         return;
     v8::HandleScope handleScope(m_isolate);
     v8::Local<v8::Script> script = v8::Local<v8::Script>::New(m_isolate, m_compiledScripts.Remove(scriptId));
     if (script.IsEmpty())
         return;
 
     if (!scriptState->contextIsValid())
         return;
     ScriptState::Scope scope(scriptState);
     v8::TryCatch tryCatch;
-    v8::Local<v8::Value> value = V8ScriptRunner::runCompiledScript(m_isolate, script, scriptState->executionContext());
+    v8::Local<v8::Value> value;
     *wasThrown = false;
+    if (V8ScriptRunner::runCompiledScript(m_isolate, script, scriptState->executionContext()).ToLocal(&value)) {
+        *result = ScriptValue(scriptState, value);
+        return;
+    }
     if (tryCatch.HasCaught()) {
         *wasThrown = true;
         *result = ScriptValue(scriptState, tryCatch.Exception());
         v8::Local<v8::Message> message = tryCatch.Message();
         if (!message.IsEmpty()) {
             *exceptionDetailsText = toCoreStringWithUndefinedOrNullCheck(message->Get());
             *lineNumber = message->GetLineNumber();
             *columnNumber = message->GetStartColumn();
             v8::Handle<v8::StackTrace> messageStackTrace = message->GetStackTrace();
             if (!messageStackTrace.IsEmpty() && messageStackTrace->GetFrameCount() > 0)
                 *stackTrace = createScriptCallStack(m_isolate, messageStackTrace, messageStackTrace->GetFrameCount());
         }
-    } else {
-        *result = ScriptValue(scriptState, value);
     }
 }
 
 } // namespace blink