DevTools: migrate protocol values from RefPtr to OwnPtr.

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 36 matching lines @@
 using blink::protocol::Debugger::CollectionEntry;
 using blink::protocol::Debugger::FunctionDetails;
 using blink::protocol::Debugger::GeneratorObjectDetails;
 using blink::protocol::Runtime::PropertyDescriptor;
 using blink::protocol::Runtime::InternalPropertyDescriptor;
 using blink::protocol::Runtime::RemoteObject;
 using blink::protocol::Maybe;
 
 namespace blink {
 
-static PassOwnPtr<protocol::Runtime::ExceptionDetails> toExceptionDetails(PassRefPtr<protocol::DictionaryValue> object)
+static PassOwnPtr<protocol::Runtime::ExceptionDetails> toExceptionDetails(protocol::DictionaryValue* object)
 {
     String text;
     if (!object->getString("text", &text))
         return nullptr;
 
     OwnPtr<protocol::Runtime::ExceptionDetails> exceptionDetails = protocol::Runtime::ExceptionDetails::create().setText(text).build();
     String url;
     if (object->getString("url", &url))
         exceptionDetails->setUrl(url);
     int line = 0;
     if (object->getNumber("line", &line))
         exceptionDetails->setLine(line);
     int column = 0;
     if (object->getNumber("column", &column))
         exceptionDetails->setColumn(column);
     int originScriptId = 0;
     object->getNumber("scriptId", &originScriptId);
 
-    RefPtr<protocol::ListValue> stackTrace = object->getArray("stackTrace");
+    protocol::ListValue* stackTrace = object->getArray("stackTrace");
     if (stackTrace && stackTrace->length() > 0) {
         OwnPtr<protocol::Array<protocol::Runtime::CallFrame>> frames = protocol::Array<protocol::Runtime::CallFrame>::create();
         for (unsigned i = 0; i < stackTrace->length(); ++i) {
-            RefPtr<protocol::DictionaryValue> stackFrame = protocol::DictionaryValue::cast(stackTrace->get(i));
+            protocol::DictionaryValue* stackFrame = protocol::DictionaryValue::cast(stackTrace->get(i));
             int lineNumber = 0;
             stackFrame->getNumber("lineNumber", &lineNumber);
             int column = 0;
             stackFrame->getNumber("column", &column);
             int scriptId = 0;
             stackFrame->getNumber("scriptId", &scriptId);
             if (i == 0 && scriptId == originScriptId)
                 originScriptId = 0;
 
             String sourceURL;
@@ skipping 42 matching lines @@
 
 void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, OwnPtr<protocol::Runtime::RemoteObject>* result, Maybe<bool>* wasThrown, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "evaluate");
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
     function.appendArgument(includeCommandLineAPI);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
-    makeEvalCall(errorString, function, result, wasThrown, exceptionDetails);
+    *result = makeEvalCall(errorString, function, wasThrown, exceptionDetails);
 }
 
 void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, bool generatePreview, OwnPtr<protocol::Runtime::RemoteObject>* result, Maybe<bool>* wasThrown)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "callFunctionOn");
     function.appendArgument(objectId);
     function.appendArgument(expression);
     function.appendArgument(arguments);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
-    makeEvalCall(errorString, function, result, wasThrown);
+    *result = makeEvalCall(errorString, function, wasThrown);
 }
 
 void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, v8::Local<v8::Object> callFrames, bool isAsyncCallStack, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, bool generatePreview, OwnPtr<RemoteObject>* result, Maybe<bool>* wasThrown, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "evaluateOnCallFrame");
     function.appendArgument(callFrames);
     function.appendArgument(isAsyncCallStack);
     function.appendArgument(callFrameId);
     function.appendArgument(expression);
     function.appendArgument(objectGroup);
     function.appendArgument(includeCommandLineAPI);
     function.appendArgument(returnByValue);
     function.appendArgument(generatePreview);
-    makeEvalCall(errorString, function, result, wasThrown, exceptionDetails);
+    *result = makeEvalCall(errorString, function, wasThrown, exceptionDetails);
 }
 
 void InjectedScript::restartFrame(ErrorString* errorString, v8::Local<v8::Object> callFrames, const String& callFrameId)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "restartFrame");
     function.appendArgument(callFrames);
     function.appendArgument(callFrameId);
-    RefPtr<protocol::Value> resultValue;
-    makeCall(function, &resultValue);
+    OwnPtr<protocol::Value> resultValue = makeCall(function);
     if (resultValue) {
         if (resultValue->type() == protocol::Value::TypeString) {
             resultValue->asString(errorString);
         } else {
             bool value;
             ASSERT_UNUSED(value, resultValue->asBoolean(&value) && value);
         }
         return;
     }
     *errorString = "Internal error";
 }
 
 void InjectedScript::getStepInPositions(ErrorString* errorString, v8::Local<v8::Object> callFrames, const String& callFrameId, Maybe<Array<protocol::Debugger::Location>>* positions)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "getStepInPositions");
     function.appendArgument(callFrames);
     function.appendArgument(callFrameId);
-    RefPtr<protocol::Value> resultValue;
-    makeCall(function, &resultValue);
+    OwnPtr<protocol::Value> resultValue = makeCall(function);
     if (resultValue) {
         if (resultValue->type() == protocol::Value::TypeString) {
             resultValue->asString(errorString);
             return;
         }
         if (resultValue->type() == protocol::Value::TypeArray) {
             protocol::ErrorSupport errors(errorString);
-            *positions = Array<protocol::Debugger::Location>::parse(resultValue.release(), &errors);
+            *positions = Array<protocol::Debugger::Location>::parse(resultValue.get(), &errors);
             return;
         }
     }
     *errorString = "Internal error";
 }
 
 void InjectedScript::setVariableValue(ErrorString* errorString,
     v8::Local<v8::Object> callFrames,
     const protocol::Maybe<String>& callFrameIdOpt,
     const protocol::Maybe<String>&  functionObjectIdOpt,
@@ skipping 10 matching lines @@
         function.appendArgument(false);
         function.appendArgument(false);
     }
     if (functionObjectIdOpt.isJust())
         function.appendArgument(functionObjectIdOpt.fromJust());
     else
         function.appendArgument(false);
     function.appendArgument(scopeNumber);
     function.appendArgument(variableName);
     function.appendArgument(newValueStr);
-    RefPtr<protocol::Value> resultValue;
-    makeCall(function, &resultValue);
+    OwnPtr<protocol::Value> resultValue = makeCall(function);
     if (!resultValue) {
         *errorString = "Internal error";
         return;
     }
     if (resultValue->type() == protocol::Value::TypeString) {
         resultValue->asString(errorString);
         return;
     }
     // Normal return.
 }
 
 void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, OwnPtr<FunctionDetails>* result)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "getFunctionDetails");
     function.appendArgument(functionId);
-    RefPtr<protocol::Value> resultValue;
-    makeCall(function, &resultValue);
+    OwnPtr<protocol::Value> resultValue = makeCall(function);
     protocol::ErrorSupport errors(errorString);
-    *result = FunctionDetails::parse(resultValue, &errors);
+    *result = FunctionDetails::parse(resultValue.get(), &errors);
 }
 
 void InjectedScript::getGeneratorObjectDetails(ErrorString* errorString, const String& objectId, OwnPtr<GeneratorObjectDetails>* result)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "getGeneratorObjectDetails");
     function.appendArgument(objectId);
-    RefPtr<protocol::Value> resultValue;
-    makeCall(function, &resultValue);
+    OwnPtr<protocol::Value> resultValue = makeCall(function);
     protocol::ErrorSupport errors(errorString);
-    *result = GeneratorObjectDetails::parse(resultValue, &errors);
+    *result = GeneratorObjectDetails::parse(resultValue.get(), &errors);
 }
 
 void InjectedScript::getCollectionEntries(ErrorString* errorString, const String& objectId, OwnPtr<Array<CollectionEntry>>* result)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "getCollectionEntries");
     function.appendArgument(objectId);
-    RefPtr<protocol::Value> resultValue;
-    makeCall(function, &resultValue);
+    OwnPtr<protocol::Value> resultValue = makeCall(function);
     protocol::ErrorSupport errors(errorString);
-    *result = Array<CollectionEntry>::parse(resultValue, &errors);
+    *result = Array<CollectionEntry>::parse(resultValue.get(), &errors);
 }
 
 void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, bool accessorPropertiesOnly, bool generatePreview, OwnPtr<Array<PropertyDescriptor>>* properties, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "getProperties");
     function.appendArgument(objectId);
     function.appendArgument(ownProperties);
     function.appendArgument(accessorPropertiesOnly);
     function.appendArgument(generatePreview);
 
-    RefPtr<protocol::Value> result;
-    makeCallWithExceptionDetails(function, &result, exceptionDetails);
+    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.release(), &errors);
+    *properties = Array<PropertyDescriptor>::parse(result.get(), &errors);
 }
 
 void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, Maybe<Array<InternalPropertyDescriptor>>* properties, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "getInternalProperties");
     function.appendArgument(objectId);
 
-    RefPtr<protocol::Value> result;
-    makeCallWithExceptionDetails(function, &result, exceptionDetails);
+    OwnPtr<protocol::Value> result = makeCallWithExceptionDetails(function, exceptionDetails);
     if (exceptionDetails->isJust())
         return;
     protocol::ErrorSupport errors(errorString);
-    OwnPtr<Array<InternalPropertyDescriptor>> array = Array<InternalPropertyDescriptor>::parse(result.release(), &errors);
+    OwnPtr<Array<InternalPropertyDescriptor>> array = Array<InternalPropertyDescriptor>::parse(result.get(), &errors);
     if (!errors.hasErrors() && array->length() > 0)
         *properties = array.release();
 }
 
 void InjectedScript::releaseObject(const String& objectId)
 {
-    RefPtr<protocol::Value> parsedObjectId = protocol::parseJSON(objectId);
+    OwnPtr<protocol::Value> parsedObjectId = protocol::parseJSON(objectId);
     if (!parsedObjectId)
         return;
-    RefPtr<protocol::DictionaryValue> object = protocol::DictionaryValue::cast(parsedObjectId);
+    protocol::DictionaryValue* object = protocol::DictionaryValue::cast(parsedObjectId.get());
     if (!object)
         return;
     int boundId = 0;
     if (!object->getNumber("id", &boundId))
         return;
     m_native->unbind(boundId);
 }
 
 v8::MaybeLocal<v8::Value> InjectedScript::runCompiledScript(v8::Local<v8::Script> script, bool includeCommandLineAPI)
 {
@@ skipping 16 matching lines @@
 
 PassOwnPtr<Array<CallFrame>> InjectedScript::wrapCallFrames(v8::Local<v8::Object> callFrames, int asyncOrdinal)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "wrapCallFrames");
     function.appendArgument(callFrames);
     function.appendArgument(asyncOrdinal);
     bool hadException = false;
     v8::Local<v8::Value> callFramesValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
-    RefPtr<protocol::Value> result = toProtocolValue(context(), callFramesValue);
+    OwnPtr<protocol::Value> result = toProtocolValue(context(), callFramesValue);
     protocol::ErrorSupport errors;
     if (result && result->type() == protocol::Value::TypeArray)
-        return Array<CallFrame>::parse(result.release(), &errors);
+        return Array<CallFrame>::parse(result.get(), &errors);
     return Array<CallFrame>::create();
 }
 
 PassOwnPtr<protocol::Runtime::RemoteObject> InjectedScript::wrapObject(v8::Local<v8::Value> value, const String& groupName, bool generatePreview) const
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "wrapObject");
     function.appendArgument(value);
     function.appendArgument(groupName);
     function.appendArgument(canAccessInspectedWindow());
     function.appendArgument(generatePreview);
     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), &errors);
+    return protocol::Runtime::RemoteObject::parse(toProtocolValue(context(), r).get(), &errors);
 }
 
 PassOwnPtr<protocol::Runtime::RemoteObject> InjectedScript::wrapTable(v8::Local<v8::Value> table, v8::Local<v8::Value> columns) const
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "wrapTable");
     function.appendArgument(canAccessInspectedWindow());
     function.appendArgument(table);
     if (columns.IsEmpty())
         function.appendArgument(false);
     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), &errors);
+    return protocol::Runtime::RemoteObject::parse(toProtocolValue(context(), r).get(), &errors);
 }
 
 v8::Local<v8::Value> InjectedScript::findObject(const RemoteObjectId& objectId) const
 {
     return m_native->objectForId(objectId.id());
 }
 
 String InjectedScript::objectGroupName(const RemoteObjectId& objectId) const
 {
     return m_native->groupName(objectId.id());
 }
 
 void InjectedScript::releaseObjectGroup(const String& objectGroup)
 {
     v8::HandleScope handles(m_isolate);
     m_native->releaseObjectGroup(objectGroup);
     if (objectGroup == "console") {
         V8FunctionCall function(m_client, context(), v8Value(), "clearLastEvaluationResult");
         bool hadException = false;
         callFunctionWithEvalEnabled(function, hadException);
         ASSERT(!hadException);
     }
 }
 
 void InjectedScript::setCustomObjectFormatterEnabled(bool enabled)
 {
     v8::HandleScope handles(m_isolate);
     V8FunctionCall function(m_client, context(), v8Value(), "setCustomObjectFormatterEnabled");
     function.appendArgument(enabled);
-    RefPtr<protocol::Value> result;
-    makeCall(function, &result);
+    makeCall(function);
 }
 
 bool InjectedScript::canAccessInspectedWindow() const
 {
     v8::Local<v8::Context> callingContext = m_isolate->GetCallingContext();
     if (callingContext.IsEmpty())
         return true;
     return m_client->callingContextCanAccessContext(callingContext, context());
 }
 
@@ skipping 14 matching lines @@
     bool evalIsDisabled = !localContext->IsCodeGenerationFromStringsAllowed();
     // Temporarily enable allow evals for inspector.
     if (evalIsDisabled)
         localContext->AllowCodeGenerationFromStrings(true);
     v8::Local<v8::Value> resultValue = function.call(hadException);
     if (evalIsDisabled)
         localContext->AllowCodeGenerationFromStrings(false);
     return resultValue;
 }
 
-void InjectedScript::makeCall(V8FunctionCall& function, RefPtr<protocol::Value>* result)
+PassOwnPtr<protocol::Value> InjectedScript::makeCall(V8FunctionCall& function)
 {
+    OwnPtr<protocol::Value> result;
     if (!canAccessInspectedWindow()) {
-        *result = protocol::StringValue::create("Can not access given context.");
-        return;
+        result = protocol::StringValue::create("Can not access given context.");
+        return nullptr;
     }
 
     bool hadException = false;
     v8::Local<v8::Value> resultValue = callFunctionWithEvalEnabled(function, hadException);
 
     ASSERT(!hadException);
     if (!hadException) {
-        *result = toProtocolValue(function.context(), resultValue);
-        if (!*result)
-            *result = protocol::StringValue::create(String::format("Object has too long reference chain(must not be longer than %d)", protocol::Value::maxDepth));
+        result = toProtocolValue(function.context(), resultValue);
+        if (!result)
+            result = protocol::StringValue::create(String::format("Object has too long reference chain(must not be longer than %d)", protocol::Value::maxDepth));
     } else {
-        *result = protocol::StringValue::create("Exception while making a call.");
+        result = protocol::StringValue::create("Exception while making a call.");
     }
+    return result.release();
 }
 
-void InjectedScript::makeEvalCall(ErrorString* errorString, V8FunctionCall& function, OwnPtr<protocol::Runtime::RemoteObject>* objectResult, Maybe<bool>* wasThrown, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
+PassOwnPtr<protocol::Runtime::RemoteObject> InjectedScript::makeEvalCall(ErrorString* errorString, V8FunctionCall& function, Maybe<bool>* wasThrown, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
 {
-    RefPtr<protocol::Value> result;
-    makeCall(function, &result);
+    OwnPtr<protocol::Value> result = makeCall(function);
     if (!result) {
         *errorString = "Internal error: result value is empty";
-        return;
+        return nullptr;
     }
     if (result->type() == protocol::Value::TypeString) {
         result->asString(errorString);
         ASSERT(errorString->length());
-        return;
+        return nullptr;
     }
-    RefPtr<protocol::DictionaryValue> resultPair = protocol::DictionaryValue::cast(result);
+    protocol::DictionaryValue* resultPair = protocol::DictionaryValue::cast(result.get());
     if (!resultPair) {
         *errorString = "Internal error: result is not an Object";
-        return;
+        return nullptr;
     }
-    RefPtr<protocol::DictionaryValue> resultObj = resultPair->getObject("result");
+    protocol::DictionaryValue* resultObj = resultPair->getObject("result");
     bool wasThrownVal = false;
     if (!resultObj || !resultPair->getBoolean("wasThrown", &wasThrownVal)) {
         *errorString = "Internal error: result is not a pair of value and wasThrown flag";
-        return;
+        return nullptr;
     }
     if (wasThrownVal) {
-        RefPtr<protocol::DictionaryValue> objectExceptionDetails = resultPair->getObject("exceptionDetails");
+        protocol::DictionaryValue* objectExceptionDetails = resultPair->getObject("exceptionDetails");
         if (objectExceptionDetails)
-            *exceptionDetails = toExceptionDetails(objectExceptionDetails.release());
+            *exceptionDetails = toExceptionDetails(objectExceptionDetails);
     }
     protocol::ErrorSupport errors(errorString);
-    *objectResult = protocol::Runtime::RemoteObject::parse(resultObj, &errors);
     *wasThrown = wasThrownVal;
+    return protocol::Runtime::RemoteObject::parse(resultObj, &errors);
 }
 
-void InjectedScript::makeCallWithExceptionDetails(V8FunctionCall& function, RefPtr<protocol::Value>* result, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
+PassOwnPtr<protocol::Value> InjectedScript::makeCallWithExceptionDetails(V8FunctionCall& function, Maybe<protocol::Runtime::ExceptionDetails>* exceptionDetails)
 {
+    OwnPtr<protocol::Value> result;
     v8::HandleScope handles(m_isolate);
     v8::Context::Scope scope(context());
     v8::TryCatch tryCatch(m_isolate);
     v8::Local<v8::Value> resultValue = function.callWithoutExceptionHandling();
     if (tryCatch.HasCaught()) {
         v8::Local<v8::Message> message = tryCatch.Message();
         String text = !message.IsEmpty() ? toWTFStringWithTypeCheck(message->Get()) : "Internal error";
         *exceptionDetails = protocol::Runtime::ExceptionDetails::create().setText(text).build();
     } else {
-        *result = toProtocolValue(function.context(), resultValue);
-        if (!*result)
-            *result = protocol::StringValue::create(String::format("Object has too long reference chain(must not be longer than %d)", protocol::Value::maxDepth));
+        result = toProtocolValue(function.context(), resultValue);
+        if (!result)
+            result = protocol::StringValue::create(String::format("Object has too long reference chain(must not be longer than %d)", protocol::Value::maxDepth));
     }
+    return result.release();
 }
 
 void InjectedScript::dispose()
 {
     m_manager->discardInjectedScript(m_contextId);
 }
 
 } // namespace blink