[DevTools] Improve ConsoleAPI functions string description

third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp

Index: third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp
diff --git a/third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp b/third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp
index db93b851e86ce39301a4b4bab054583de1917e23..e55a96971742b23ec05131a331d36a4e5a9ef13c 100644
--- a/third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp
+++ b/third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp
@@ -179,6 +179,13 @@ static void returnDataCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
     info.GetReturnValue().Set(info.Data());
 }
 
+static v8::Maybe<bool> createDataProperty(v8::Local<v8::Context> context, v8::Local<v8::Object> object, v8::Local<v8::Name> key, v8::Local<v8::Value> value)
+{
+    v8::TryCatch tryCatch(context->GetIsolate());
+    v8::Isolate::DisallowJavascriptExecutionScope throwJs(context->GetIsolate(), v8::Isolate::DisallowJavascriptExecutionScope::THROW_ON_FAILURE);
+    return object->CreateDataProperty(context, key, value);
+}
+
 static void createFunctionPropertyWithData(v8::Local<v8::Context> context, v8::Local<v8::Object> object, const char* name, v8::FunctionCallback callback, v8::Local<v8::Value> data, const char* description)
 {
     v8::Local<v8::String> funcName = v8String(context->GetIsolate(), name);
@@ -189,9 +196,15 @@ static void createFunctionPropertyWithData(v8::Local<v8::Context> context, v8::L
     v8::Local<v8::String> returnValue = v8String(context->GetIsolate(), description);
     v8::Local<v8::Function> toStringFunction;
     if (v8::Function::New(context, returnDataCallback, returnValue, 0, v8::ConstructorBehavior::kThrow).ToLocal(&toStringFunction))
-        func->Set(v8String(context->GetIsolate(), "toString"), toStringFunction);
-    if (!object->Set(context, funcName, func).FromMaybe(false))
-        return;
+        createDataProperty(context, func, v8String(context->GetIsolate(), "toString"), toStringFunction);
+    createDataProperty(context, object, funcName, func);
+}
+
+v8::Maybe<bool> ThreadDebugger::createDataPropertyInArray(v8::Local<v8::Context> context, v8::Local<v8::Array> array, int index, v8::Local<v8::Value> value)
+{
+    v8::TryCatch tryCatch(context->GetIsolate());
+    v8::Isolate::DisallowJavascriptExecutionScope throwJs(context->GetIsolate(), v8::Isolate::DisallowJavascriptExecutionScope::THROW_ON_FAILURE);
+    return array->CreateDataProperty(context, index, value);
 }
 
 void ThreadDebugger::createFunctionProperty(v8::Local<v8::Context> context, v8::Local<v8::Object> object, const char* name, v8::FunctionCallback callback, const char* description)
@@ -292,7 +305,8 @@ void ThreadDebugger::getEventListenersCallback(const v8::FunctionCallbackInfo<v8
     ThreadDebugger* debugger = static_cast<ThreadDebugger*>(v8::Local<v8::External>::Cast(info.Data())->Value());
     DCHECK(debugger);
     v8::Isolate* isolate = info.GetIsolate();
-    int groupId = debugger->contextGroupId(toExecutionContext(isolate->GetCurrentContext()));
+    v8::Local<v8::Context> context = isolate->GetCurrentContext();
+    int groupId = debugger->contextGroupId(toExecutionContext(context));
 
     V8EventListenerInfoList listenerInfo;
     // eventListeners call can produce message on ErrorEvent during lazy event listener compilation.
@@ -311,18 +325,18 @@ void ThreadDebugger::getEventListenersCallback(const v8::FunctionCallbackInfo<v8
             currentEventType = info.eventType;
             listeners = v8::Array::New(isolate);
             outputIndex = 0;
-            result->Set(v8String(isolate, currentEventType), listeners);
+            createDataProperty(context, result, v8String(isolate, currentEventType), listeners);
         }
 
         v8::Local<v8::Object> listenerObject = v8::Object::New(isolate);
-        listenerObject->Set(v8String(isolate, "listener"), info.handler);
-        listenerObject->Set(v8String(isolate, "useCapture"), v8::Boolean::New(isolate, info.useCapture));
-        listenerObject->Set(v8String(isolate, "passive"), v8::Boolean::New(isolate, info.passive));
-        listenerObject->Set(v8String(isolate, "type"), v8String(isolate, currentEventType));
+        createDataProperty(context, listenerObject, v8String(isolate, "listener"), info.handler);
+        createDataProperty(context, listenerObject, v8String(isolate, "useCapture"), v8::Boolean::New(isolate, info.useCapture));
+        createDataProperty(context, listenerObject, v8String(isolate, "passive"), v8::Boolean::New(isolate, info.passive));
+        createDataProperty(context, listenerObject, v8String(isolate, "type"), v8String(isolate, currentEventType));
         v8::Local<v8::Function> removeFunction;
         if (info.removeFunction.ToLocal(&removeFunction))
-            listenerObject->Set(v8String(isolate, "remove"), removeFunction);
-        listeners->Set(outputIndex++, listenerObject);
+            createDataProperty(context, listenerObject, v8String(isolate, "remove"), removeFunction);
+        createDataPropertyInArray(context, listeners, outputIndex++, listenerObject);
     }
     info.GetReturnValue().Set(result);
 }