Roll third_party/inspector_protocol to 4ad35c45aca9834b67ec2cb152c816ea1b7ceb48

src/inspector/injected-script.cc

 /*
  * 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 132 matching lines @@
     // FIXME: make properties optional
     *properties = Array<PropertyDescriptor>::create();
     return Response::OK();
   }
   if (resultValue.IsEmpty()) return Response::InternalError();
   std::unique_ptr<protocol::Value> protocolValue;
   Response response = toProtocolValue(context, resultValue, &protocolValue);
   if (!response.isSuccess()) return response;
   protocol::ErrorSupport errors;
   std::unique_ptr<Array<PropertyDescriptor>> result =
-      Array<PropertyDescriptor>::parse(protocolValue.get(), &errors);
+      Array<PropertyDescriptor>::fromValue(protocolValue.get(), &errors);
   if (errors.hasErrors()) return Response::Error(errors.errors());
   *properties = std::move(result);
   return Response::OK();
 }
 
 void InjectedScript::releaseObject(const String16& objectId) {
   std::unique_ptr<protocol::Value> parsedObjectId =
       protocol::StringUtil::parseJSON(objectId);
   if (!parsedObjectId) return;
   protocol::DictionaryValue* object =
@@ skipping 13 matching lines @@
   v8::Local<v8::Context> context = m_context->context();
   Response response = wrapValue(value, groupName, forceValueType,
                                 generatePreview, &wrappedObject);
   if (!response.isSuccess()) return response;
   protocol::ErrorSupport errors;
   std::unique_ptr<protocol::Value> protocolValue;
   response = toProtocolValue(context, wrappedObject, &protocolValue);
   if (!response.isSuccess()) return response;
 
   *result =
-      protocol::Runtime::RemoteObject::parse(protocolValue.get(), &errors);
+      protocol::Runtime::RemoteObject::fromValue(protocolValue.get(), &errors);
   if (!result->get()) return Response::Error(errors.errors());
   return Response::OK();
 }
 
 Response InjectedScript::wrapObjectProperty(v8::Local<v8::Object> object,
                                             v8::Local<v8::Name> key,
                                             const String16& groupName,
                                             bool forceValueType,
                                             bool generatePreview) const {
   v8::Local<v8::Value> property;
@@ skipping 55 matching lines @@
     function.appendArgument(false);
   else
     function.appendArgument(columns);
   bool hadException = false;
   v8::Local<v8::Value> r = function.call(hadException);
   if (hadException || r.IsEmpty()) return nullptr;
   std::unique_ptr<protocol::Value> protocolValue;
   Response response = toProtocolValue(context, r, &protocolValue);
   if (!response.isSuccess()) return nullptr;
   protocol::ErrorSupport errors;
-  return protocol::Runtime::RemoteObject::parse(protocolValue.get(), &errors);
+  return protocol::Runtime::RemoteObject::fromValue(protocolValue.get(),
+                                                    &errors);
 }
 
 Response InjectedScript::findObject(const RemoteObjectId& objectId,
                                     v8::Local<v8::Value>* outObject) const {
   *outObject = m_native->objectForId(objectId.id());
   if (outObject->IsEmpty())
     return Response::Error("Could not find object with given id");
   return Response::OK();
 }
 
@@ skipping 36 matching lines @@
     if (!response.isSuccess()) return response;
     if (remoteObjectId->contextId() != m_context->contextId())
       return Response::Error(
           "Argument should belong to the same JavaScript world as target "
           "object");
     return findObject(*remoteObjectId, result);
   }
   if (callArgument->hasValue() || callArgument->hasUnserializableValue()) {
     String16 value =
         callArgument->hasValue()
-            ? callArgument->getValue(nullptr)->toJSONString()
+            ? callArgument->getValue(nullptr)->serialize()
             : "Number(\"" + callArgument->getUnserializableValue("") + "\")";
     if (!m_context->inspector()
              ->compileAndRunInternalScript(
                  m_context->context(), toV8String(m_context->isolate(), value))
              .ToLocal(result)) {
       return Response::Error("Couldn't parse value object in call argument");
     }
     return Response::OK();
   }
   *result = v8::Undefined(m_context->isolate());
@@ skipping 202 matching lines @@
 Response InjectedScript::CallFrameScope::findInjectedScript(
     V8InspectorSessionImpl* session) {
   std::unique_ptr<RemoteCallFrameId> remoteId;
   Response response = RemoteCallFrameId::parse(m_remoteCallFrameId, &remoteId);
   if (!response.isSuccess()) return response;
   m_frameOrdinal = static_cast<size_t>(remoteId->frameOrdinal());
   return session->findInjectedScript(remoteId.get(), m_injectedScript);
 }
 
 }  // namespace v8_inspector