Update ScriptController's resourceInfo() to use V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN()

Source/bindings/v8/ScriptController.cpp

 /*
  * Copyright (C) 2008, 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple 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.
@@ skipping 135 matching lines @@
     m_windowShell->updateSecurityOrigin();
 }
 
 v8::Local<v8::Value> ScriptController::callFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> info[])
 {
     // Keep Frame (and therefore ScriptController) alive.
     RefPtr<Frame> protect(m_frame);
     return ScriptController::callFunction(m_frame->document(), function, receiver, argc, info, m_isolate);
 }
 
-static void resourceInfo(const v8::Handle<v8::Function> function, String& resourceName, int& lineNumber)
+static bool resourceInfo(const v8::Handle<v8::Function> function, String& resourceName, int& lineNumber)
 {
     v8::ScriptOrigin origin = function->GetScriptOrigin();
     if (origin.ResourceName().IsEmpty()) {
         resourceName = "undefined";
         lineNumber = 1;
     } else {
-        resourceName = toWebCoreString(origin.ResourceName());
+        V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN(V8StringResource<>, stringResourceName, origin.ResourceName(), false);

[haraken, 2013/11/15 16:23:11]

Is there any code that wants to return other than false? If no, we can drop
'false' from call sites.

I'm thinking about how to refactor these unreadable macros.

V8TRYCATCH => ToNativeValueOrException
V8TRYCATCH_VOID => ToNativeValue
V8TRYCATCH_RETURN => ToNativeValueOrFalse
V8TRYCATCH_FOR_V8STRINGRESOURCE => ToV8StringResourceOrException
V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID => ToV8StringResource
V8TRYCATCH_FOR_V8STRINGRESOURCE_RETURN => ToV8StringResourceOrFalse

Any better suggestion is welcome :)

[Inactive, 2013/11/15 16:28:49]

Yes, some call sites want to return something else than false, like String() or
v8::Local<v8::Value>(). I think it is best to keep this level of flexibility.

+        resourceName = stringResourceName;
         lineNumber = function->GetScriptLineNumber() + 1;
     }
+    return true;
 }
 
 v8::Local<v8::Value> ScriptController::callFunction(ExecutionContext* context, v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> info[], v8::Isolate* isolate)
 {
     InspectorInstrumentationCookie cookie;
     if (InspectorInstrumentation::timelineAgentEnabled(context)) {
         String resourceName;
         int lineNumber;
-        resourceInfo(function, resourceName, lineNumber);
+        if (!resourceInfo(function, resourceName, lineNumber))
+            return v8::Local<v8::Value>();
         cookie = InspectorInstrumentation::willCallFunction(context, resourceName, lineNumber);
     }
 
     v8::Local<v8::Value> result = V8ScriptRunner::callFunction(function, context, receiver, argc, info, isolate);
 
     InspectorInstrumentation::didCallFunction(cookie);
     return result;
 }
 
 v8::Local<v8::Value> ScriptController::executeScriptAndReturnValue(v8::Handle<v8::Context> context, const ScriptSourceCode& source, AccessControlStatus corsStatus)
@@ skipping 502 matching lines @@
         v8Results = evaluateHandleScope.Close(resultArray);
     }
 
     if (results && !v8Results.IsEmpty()) {
         for (size_t i = 0; i < v8Results->Length(); ++i)
             results->append(ScriptValue(v8Results->Get(i), m_isolate));
     }
 }
 
 } // namespace WebCore