[DevTools] Improve ConsoleAPI functions string description

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

 // Copyright 2016 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 "core/inspector/ThreadDebugger.h"
 
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMException.h"
 #include "bindings/core/v8/V8DOMTokenList.h"
@@ skipping 161 matching lines @@
     if (!wrapper.IsEmpty() && wrapper->IsUndefined())
         return false;
     return true;
 }
 
 static void returnDataCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     info.GetReturnValue().Set(info.Data());
 }
 
+static v8::Maybe<bool> safeCreateDataProperty(v8::Local<v8::Context> context, v8::Local<v8::Object> object, v8::Local<v8::Name> key, v8::Local<v8::Value> value)

[dgozman, 2016/08/23 19:27:37]

Let's put this on ThreadDebugger as well, similar to array one.

[kozy, 2016/08/23 19:33:45]

Acknowledged.

+{
+    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);
     v8::Local<v8::Function> func;
     if (!v8::Function::New(context, callback, data, 0, v8::ConstructorBehavior::kThrow).ToLocal(&func))
         return;
     func->SetName(funcName);
     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;
+        safeCreateDataProperty(context, func, v8String(context->GetIsolate(), "toString"), toStringFunction);
+    safeCreateDataProperty(context, object, funcName, func);
+}
+
+v8::Maybe<bool> ThreadDebugger::safeCreateDataPropertyInArray(v8::Local<v8::Context> context, v8::Local<v8::Array> array, int index, v8::Local<v8::Value> value)
+{
+    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)
 {
     createFunctionPropertyWithData(context, object, name, callback, v8::External::New(context->GetIsolate(), this), description);
 }
 
 void ThreadDebugger::installAdditionalCommandLineAPI(v8::Local<v8::Context> context, v8::Local<v8::Object> object)
 {
     createFunctionProperty(context, object, "getEventListeners", ThreadDebugger::getEventListenersCallback, "function getEventListeners(node) { [Command Line API] }");
@@ skipping 80 matching lines @@
 
 // static
 void ThreadDebugger::getEventListenersCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     if (info.Length() < 1)
         return;
 
     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.
     if (groupId)
         debugger->muteMetrics(groupId);
     InspectorDOMDebuggerAgent::eventListenersInfoForTarget(isolate, info[0], listenerInfo);
     if (groupId)
         debugger->unmuteMetrics(groupId);
 
     v8::Local<v8::Object> result = v8::Object::New(isolate);
     AtomicString currentEventType;
     v8::Local<v8::Array> listeners;
     size_t outputIndex = 0;
     for (auto& info : listenerInfo) {
         if (currentEventType != info.eventType) {
             currentEventType = info.eventType;
             listeners = v8::Array::New(isolate);
             outputIndex = 0;
-            result->Set(v8String(isolate, currentEventType), listeners);
+            safeCreateDataProperty(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));
+        safeCreateDataProperty(context, listenerObject, v8String(isolate, "listener"), info.handler);
+        safeCreateDataProperty(context, listenerObject, v8String(isolate, "useCapture"), v8::Boolean::New(isolate, info.useCapture));
+        safeCreateDataProperty(context, listenerObject, v8String(isolate, "passive"), v8::Boolean::New(isolate, info.passive));
+        safeCreateDataProperty(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);
+            safeCreateDataProperty(context, listenerObject, v8String(isolate, "remove"), removeFunction);
+        safeCreateDataPropertyInArray(context, listeners, outputIndex++, listenerObject);
     }
     info.GetReturnValue().Set(result);
 }
 
 void ThreadDebugger::consoleTime(const String16& title)
 {
     TRACE_EVENT_COPY_ASYNC_BEGIN0("blink.console", String(title).utf8().data(), this);
 }
 
 void ThreadDebugger::consoleTimeEnd(const String16& title)
@@ skipping 35 matching lines @@
 {
     for (size_t index = 0; index < m_timers.size(); ++index) {
         if (m_timers[index].get() == timer) {
             m_timerCallbacks[index](m_timerData[index]);
             return;
         }
     }
 }
 
 } // namespace blink