[DevTools] Move getInternalProperties to native

third_party/WebKit/Source/platform/v8_inspector/InjectedScript.cpp

 /*
  * Copyright (C) 2012 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 97 matching lines @@
     OwnPtr<protocol::Value> result = makeCallWithExceptionDetails(function, exceptionDetails);
     if (exceptionDetails->isJust()) {
         // FIXME: make properties optional
         *properties = Array<PropertyDescriptor>::create();
         return;
     }
     protocol::ErrorSupport errors(errorString);
     *properties = Array<PropertyDescriptor>::parse(result.get(), &errors);
 }
 
-void InjectedScript::getInternalProperties(ErrorString* errorString, const String16& objectId, Maybe<Array<InternalPropertyDescriptor>>* properties, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
-{
-    v8::HandleScope handles(m_isolate);
-    V8FunctionCall function(m_manager->debugger(), context(), v8Value(), "getInternalProperties");
-    function.appendArgument(objectId);
-
-    OwnPtr<protocol::Value> result = makeCallWithExceptionDetails(function, exceptionDetails);
-    if (exceptionDetails->isJust())
-        return;
-    protocol::ErrorSupport errors(errorString);
-    OwnPtr<Array<InternalPropertyDescriptor>> array = Array<InternalPropertyDescriptor>::parse(result.get(), &errors);
-    if (!errors.hasErrors() && array->length() > 0)
-        *properties = array.release();
-}
-
 void InjectedScript::releaseObject(const String16& objectId)
 {
     OwnPtr<protocol::Value> parsedObjectId = protocol::parseJSON(objectId);
     if (!parsedObjectId)
         return;
     protocol::DictionaryValue* object = protocol::DictionaryValue::cast(parsedObjectId.get());
     if (!object)
         return;
     int boundId = 0;
     if (!object->getNumber("id", &boundId))
@@ skipping 76 matching lines @@
     else
         function.appendArgument(columns);
     bool hadException = false;
     v8::Local<v8::Value>  r = callFunctionWithEvalEnabled(function, hadException);
     if (hadException)
         return nullptr;
     protocol::ErrorSupport errors;
     return protocol::Runtime::RemoteObject::parse(toProtocolValue(context(), r).get(), &errors);
 }
 
-v8::Local<v8::Value> InjectedScript::findObject(const RemoteObjectId& objectId) const
+bool InjectedScript::findObject(ErrorString* errorString, const RemoteObjectId& objectId, v8::Local<v8::Value>* outObject) const
 {
-    return m_native->objectForId(objectId.id());
+    *outObject = m_native->objectForId(objectId.id());
+    if (outObject->IsEmpty())
+        *errorString = "Could not find object with given id";
+    return !outObject->IsEmpty();
 }
 
 String16 InjectedScript::objectGroupName(const RemoteObjectId& objectId) const
 {
     return m_native->groupName(objectId.id());
 }
 
 void InjectedScript::releaseObjectGroup(const String16& objectGroup)
 {
     v8::HandleScope handles(m_isolate);
@@ skipping 106 matching lines @@
 v8::MaybeLocal<v8::Value> InjectedScript::resolveCallArgument(ErrorString* errorString, protocol::Runtime::CallArgument* callArgument)
 {
     if (callArgument->hasObjectId()) {
         OwnPtr<RemoteObjectId> remoteObjectId = RemoteObjectId::parse(errorString, callArgument->getObjectId(""));
         if (!remoteObjectId)
             return v8::MaybeLocal<v8::Value>();
         if (remoteObjectId->contextId() != m_contextId) {
             *errorString = "Argument should belong to the same JavaScript world as target object";
             return v8::MaybeLocal<v8::Value>();
         }
-        v8::Local<v8::Value> object = findObject(*remoteObjectId);
-        if (object.IsEmpty()) {
-            *errorString = "Could not find object with given id";
+        v8::Local<v8::Value> object;
+        if (!findObject(errorString, *remoteObjectId, &object))
             return v8::MaybeLocal<v8::Value>();
-        }
         return object;
     }
     if (callArgument->hasValue()) {
         String16 value = callArgument->getValue(nullptr)->toJSONString();
         if (callArgument->getType(String16()) == "number")
             value = "Number(" + value + ")";
         v8::Local<v8::Value> object;
         if (!m_manager->debugger()->compileAndRunInternalScript(context(), toV8String(m_isolate, value)).ToLocal(&object)) {
             *errorString = "Couldn't parse value object in call argument";
             return v8::MaybeLocal<v8::Value>();
@@ skipping 70 matching lines @@
             return;
         *result = remoteObject.release();
         if (exceptionDetails)
             *exceptionDetails = createExceptionDetails(tryCatch.Message());
         if (wasThrown)
             *wasThrown = true;
     }
 }
 
 } // namespace blink