Make error messages about private scripts more descriptive

Source/bindings/core/v8/PrivateScriptRunner.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "bindings/core/v8/PrivateScriptRunner.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8Binding.h"
@@ skipping 19 matching lines @@
         return V8ScriptRunner::compileAndRunInternalScript(v8String(isolate, source), isolate);
     }
 #endif
 
     // |kPrivateScriptSources| is defined in V8PrivateScriptSources.h, which is auto-generated
     // by make_private_script.py.
     for (index = 0; index < WTF_ARRAY_LENGTH(kPrivateScriptSources); index++) {
         if (className == kPrivateScriptSources[index].name)
             break;
     }
-    RELEASE_ASSERT(index != WTF_ARRAY_LENGTH(kPrivateScriptSources));
+    if (index == WTF_ARRAY_LENGTH(kPrivateScriptSources)) {
+        FATAL("Private script error: Target source code was not found. (Class name = %s)\n", className.utf8().data());
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+
+    v8::TryCatch block;
     String source(reinterpret_cast<const char*>(kPrivateScriptSources[index].source), kPrivateScriptSources[index].size);
-    return V8ScriptRunner::compileAndRunInternalScript(v8String(isolate, source), isolate);
+    v8::Handle<v8::Value> result = V8ScriptRunner::compileAndRunInternalScript(v8String(isolate, source), isolate);
+    if (block.HasCaught()) {
+        FATAL("Private script error: Compile failed. (Class name = %s)\n", className.utf8().data());
+        if (!block.Message().IsEmpty())
+            FATAL("%s\n", toCoreString(block.Message()->Get()).utf8().data());
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+    return result;
 }
 
 static v8::Handle<v8::Object> classObjectOfPrivateScript(ScriptState* scriptState, String className)
 {
     ASSERT(scriptState->perContextData());
     ASSERT(scriptState->executionContext());
     v8::Isolate* isolate = scriptState->isolate();
     v8::Handle<v8::Value> compiledClass = scriptState->perContextData()->compiledPrivateScript(className);
     if (compiledClass.IsEmpty()) {
         v8::Handle<v8::Value> installedClasses = scriptState->perContextData()->compiledPrivateScript("PrivateScriptRunner");
@@ skipping 33 matching lines @@
 static void initializeHolderIfNeeded(ScriptState* scriptState, v8::Handle<v8::Object> classObject, v8::Handle<v8::Value> holder)
 {
     RELEASE_ASSERT(!holder.IsEmpty());
     RELEASE_ASSERT(holder->IsObject());
     v8::Handle<v8::Object> holderObject = v8::Handle<v8::Object>::Cast(holder);
     v8::Isolate* isolate = scriptState->isolate();
     v8::Handle<v8::Value> isInitialized = V8HiddenValue::getHiddenValue(isolate, holderObject, V8HiddenValue::privateScriptObjectIsInitialized(isolate));
     if (isInitialized.IsEmpty()) {
         v8::Handle<v8::Value> initializeFunction = classObject->Get(v8String(isolate, "constructor"));
         if (!initializeFunction.IsEmpty() && initializeFunction->IsFunction()) {
+            v8::TryCatch block;
             V8ScriptRunner::callFunction(v8::Handle<v8::Function>::Cast(initializeFunction), scriptState->executionContext(), holder, 0, 0, isolate);
+            if (block.HasCaught()) {
+                FATAL("Private script error: Object constructor threw an exception.\n");
+                if (!block.Message().IsEmpty())
+                    FATAL("%s\n", toCoreString(block.Message()->Get()).utf8().data());
+                RELEASE_ASSERT_NOT_REACHED();
+            }
         }
         isInitialized = v8Boolean(true, isolate);
         V8HiddenValue::setHiddenValue(isolate, holderObject, V8HiddenValue::privateScriptObjectIsInitialized(isolate), isInitialized);
     }
 }
 
 v8::Handle<v8::Value> PrivateScriptRunner::installClass(LocalFrame* frame, String className)
 {
     if (!frame)
         return v8::Handle<v8::Value>();
     v8::Handle<v8::Context> context = toV8Context(frame, DOMWrapperWorld::privateScriptIsolatedWorld());
     if (context.IsEmpty())
         return v8::Handle<v8::Value>();
     ScriptState* scriptState = ScriptState::from(context);
     if (!scriptState->executionContext())
         return v8::Handle<v8::Value>();
 
     ScriptState::Scope scope(scriptState);
     return classObjectOfPrivateScript(scriptState, className);
 }
 
 v8::Handle<v8::Value> PrivateScriptRunner::runDOMAttributeGetter(ScriptState* scriptState, String className, String attributeName, v8::Handle<v8::Value> holder)
 {
     v8::Handle<v8::Object> classObject = classObjectOfPrivateScript(scriptState, className);
     v8::Handle<v8::Object> descriptor = getOwnPropertyDescriptor(scriptState, classObject, attributeName);
     v8::Handle<v8::Value> getter = descriptor->Get(v8String(scriptState->isolate(), "get"));
-    RELEASE_ASSERT(!getter.IsEmpty());
-    RELEASE_ASSERT(getter->IsFunction());
+    if (getter.IsEmpty() || !getter->IsFunction()) {
+        FATAL("Private script error: Target DOM attribute getter was not found. (Class name = %s, Attribute name = %s)\n", className.utf8().data(), attributeName.utf8().data());
+        RELEASE_ASSERT_NOT_REACHED();
+    }
     initializeHolderIfNeeded(scriptState, classObject, holder);
     return V8ScriptRunner::callFunction(v8::Handle<v8::Function>::Cast(getter), scriptState->executionContext(), holder, 0, 0, scriptState->isolate());
 }
 
 void PrivateScriptRunner::runDOMAttributeSetter(ScriptState* scriptState, String className, String attributeName, v8::Handle<v8::Value> holder, v8::Handle<v8::Value> v8Value)
 {
     v8::Handle<v8::Object> classObject = classObjectOfPrivateScript(scriptState, className);
     v8::Handle<v8::Object> descriptor = getOwnPropertyDescriptor(scriptState, classObject, attributeName);
     v8::Handle<v8::Value> setter = descriptor->Get(v8String(scriptState->isolate(), "set"));
-    RELEASE_ASSERT(!setter.IsEmpty());
-    RELEASE_ASSERT(setter->IsFunction());
+    if (setter.IsEmpty() || !setter->IsFunction()) {
+        FATAL("Private script error: Target DOM attribute setter was not found. (Class name = %s, Attribute name = %s)\n", className.utf8().data(), attributeName.utf8().data());
+        RELEASE_ASSERT_NOT_REACHED();
+    }
     initializeHolderIfNeeded(scriptState, classObject, holder);
     v8::Handle<v8::Value> argv[] = { v8Value };
     V8ScriptRunner::callFunction(v8::Handle<v8::Function>::Cast(setter), scriptState->executionContext(), holder, WTF_ARRAY_LENGTH(argv), argv, scriptState->isolate());
 }
 
 v8::Handle<v8::Value> PrivateScriptRunner::runDOMMethod(ScriptState* scriptState, String className, String methodName, v8::Handle<v8::Value> holder, int argc, v8::Handle<v8::Value> argv[])
 {
     v8::Handle<v8::Object> classObject = classObjectOfPrivateScript(scriptState, className);
     v8::Handle<v8::Value> method = classObject->Get(v8String(scriptState->isolate(), methodName));
-    RELEASE_ASSERT(!method.IsEmpty());
-    RELEASE_ASSERT(method->IsFunction());
+    if (method.IsEmpty() || !method->IsFunction()) {
+        FATAL("Private script error: Target DOM method was not found. (Class name = %s, Method name = %s)\n", className.utf8().data(), methodName.utf8().data());
+        RELEASE_ASSERT_NOT_REACHED();
+    }
     initializeHolderIfNeeded(scriptState, classObject, holder);
     return V8ScriptRunner::callFunction(v8::Handle<v8::Function>::Cast(method), scriptState->executionContext(), holder, argc, argv, scriptState->isolate());
 }
 
 bool PrivateScriptRunner::throwDOMExceptionInPrivateScriptIfNeeded(v8::Isolate* isolate, ExceptionState& exceptionState, v8::Handle<v8::Value> exception)
 {
     if (exception.IsEmpty() || !exception->IsObject())
         return false;
 
     v8::Handle<v8::Object> exceptionObject = v8::Handle<v8::Object>::Cast(exception);
     v8::Handle<v8::Value> type = exceptionObject->Get(v8String(isolate, "type"));
     if (type.IsEmpty() || !type->IsString())
         return false;
     if (toCoreString(v8::Handle<v8::String>::Cast(type)) != "DOMExceptionInPrivateScript")
         return false;
 
     v8::Handle<v8::Value> message = exceptionObject->Get(v8String(isolate, "message"));
     RELEASE_ASSERT(!message.IsEmpty() && message->IsString());
     v8::Handle<v8::Value> code = exceptionObject->Get(v8String(isolate, "code"));
     RELEASE_ASSERT(!code.IsEmpty() && code->IsInt32());
     // FIXME: Support JavaScript errors such as TypeError, RangeError and SecurityError.
     exceptionState.throwDOMException(toInt32(code), toCoreString(v8::Handle<v8::String>::Cast(message)));
     exceptionState.throwIfNeeded();
     return true;
 }
 
 } // namespace WebCore