DevTools: make InjectedScript heap-allocated.

third_party/WebKit/Source/core/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 316 matching lines @@
     if (!parsedObjectId->asObject(&object))
         return;
     int boundId = 0;
     if (!object->getNumber("id", &boundId))
         return;
     m_native->unbind(boundId);
 }
 
 PassRefPtr<Array<CallFrame>> InjectedScript::wrapCallFrames(v8::Local<v8::Object> callFrames, int asyncOrdinal)
 {
-    ASSERT(!isEmpty());
     ScriptFunctionCall function(injectedScriptObject(), "wrapCallFrames");
     function.appendArgument(callFrames);
     function.appendArgument(asyncOrdinal);
     bool hadException = false;
     ScriptValue callFramesValue = callFunctionWithEvalEnabled(function, hadException);
     ASSERT(!hadException);
     RefPtr<JSONValue> result = toJSONValue(callFramesValue);
     if (result && result->type() == JSONValue::TypeArray)
         return Array<CallFrame>::runtimeCast(result);
     return Array<CallFrame>::create();
 }
 
 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(const ScriptValue& value, const String& groupName, bool generatePreview) const
 {
-    ASSERT(!isEmpty());
     ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapObject");
     wrapFunction.appendArgument(value);
     wrapFunction.appendArgument(groupName);
     wrapFunction.appendArgument(canAccessInspectedWindow());
     wrapFunction.appendArgument(generatePreview);
     bool hadException = false;
     ScriptValue r = callFunctionWithEvalEnabled(wrapFunction, hadException);
     if (hadException)
         return nullptr;
     RefPtr<JSONObject> rawResult = toJSONValue(r)->asObject();
     return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
 }
 
 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapTable(const ScriptValue& table, const ScriptValue& columns) const
 {
-    ASSERT(!isEmpty());
     ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapTable");
     wrapFunction.appendArgument(canAccessInspectedWindow());
     wrapFunction.appendArgument(table);
     if (columns.isEmpty())
         wrapFunction.appendArgument(false);
     else
         wrapFunction.appendArgument(columns);
     bool hadException = false;
     ScriptValue r = callFunctionWithEvalEnabled(wrapFunction, hadException);
     if (hadException)
         return nullptr;
     RefPtr<JSONObject> rawResult = toJSONValue(r)->asObject();
     return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
 }
 
 v8::Local<v8::Value> InjectedScript::findObject(const RemoteObjectId& objectId) const
 {
-    ASSERT(!isEmpty());
     return m_native->objectForId(objectId.id());
 }
 
 String InjectedScript::objectIdToObjectGroupName(const String& objectId) const
 {
     RefPtr<JSONValue> parsedObjectId = parseJSON(objectId);
     if (!parsedObjectId)
         return String();
     RefPtr<JSONObject> object;
     if (!parsedObjectId->asObject(&object))
         return String();
     int boundId = 0;
     if (!object->getNumber("id", &boundId))
         return String();
     return m_native->groupName(boundId);
 }
 
 void InjectedScript::releaseObjectGroup(const String& objectGroup)
 {
-    ASSERT(!isEmpty());
     m_native->releaseObjectGroup(objectGroup);
     if (objectGroup == "console") {
         ScriptFunctionCall releaseFunction(injectedScriptObject(), "clearLastEvaluationResult");
         bool hadException = false;
         callFunctionWithEvalEnabled(releaseFunction, hadException);
         ASSERT(!hadException);
     }
 }
 
 void InjectedScript::setCustomObjectFormatterEnabled(bool enabled)
 {
-    ASSERT(!isEmpty());
     ScriptFunctionCall function(injectedScriptObject(), "setCustomObjectFormatterEnabled");
     function.appendArgument(enabled);
     RefPtr<JSONValue> result;
     makeCall(function, &result);
 }
 
 void InjectedScript::initialize(ScriptValue injectedScriptObject, InspectedStateAccessCheck accessCheck)
 {
     m_injectedScriptObject = injectedScriptObject;
     m_inspectedStateAccessCheck = accessCheck;
 }
 
 bool InjectedScript::canAccessInspectedWindow() const
 {
-    ASSERT(!isEmpty());
     return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
 }
 
 const ScriptValue& InjectedScript::injectedScriptObject() const
 {
     return m_injectedScriptObject;
 }
 
 ScriptValue InjectedScript::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
 {
-    ASSERT(!isEmpty());
-
     ScriptState* scriptState = m_injectedScriptObject.scriptState();
     ScriptState::Scope scope(scriptState);
     bool evalIsDisabled = !scriptState->evalEnabled();
     // Temporarily enable allow evals for inspector.
     if (evalIsDisabled)
         scriptState->setEvalEnabled(true);
 
     ScriptValue resultValue = function.call(hadException);
 
     if (evalIsDisabled)
         scriptState->setEvalEnabled(false);
 
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "UpdateCounters", TRACE_EVENT_SCOPE_THREAD, "data", InspectorUpdateCountersEvent::data());
     return resultValue;
 }
 
 void InjectedScript::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue>* result)
 {
-    if (isEmpty() || !canAccessInspectedWindow()) {
+    if (!canAccessInspectedWindow()) {
         *result = JSONValue::null();
         return;
     }
 
     bool hadException = false;
     ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
 
     ASSERT(!hadException);
     if (!hadException) {
         *result = toJSONValue(resultValue);
@@ skipping 47 matching lines @@
         String text = !message.IsEmpty() ? toCoreStringWithUndefinedOrNullCheck(message->Get()) : "Internal error";
         *exceptionDetails = TypeBuilder::Debugger::ExceptionDetails::create().setText(text);
     } else {
         *result = toJSONValue(resultValue);
         if (!*result)
             *result = JSONString::create(String::format("Object has too long reference chain(must not be longer than %d)", JSONValue::maxDepth));
     }
 }
 
 } // namespace blink