Remove ScriptObject

Source/core/inspector/InjectedScriptBase.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 31 matching lines @@
 using WebCore::TypeBuilder::Runtime::RemoteObject;
 
 namespace WebCore {
 
 InjectedScriptBase::InjectedScriptBase(const String& name)
     : m_name(name)
     , m_inspectedStateAccessCheck(0)
 {
 }
 
-InjectedScriptBase::InjectedScriptBase(const String& name, ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
+InjectedScriptBase::InjectedScriptBase(const String& name, ScriptValue injectedScriptValue, InspectedStateAccessCheck accessCheck)
     : m_name(name)
-    , m_injectedScriptObject(injectedScriptObject)
+    , m_injectedScriptValue(injectedScriptValue)
     , m_inspectedStateAccessCheck(accessCheck)
 {
 }
 
-void InjectedScriptBase::initialize(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
+void InjectedScriptBase::initialize(ScriptValue injectedScriptValue, InspectedStateAccessCheck accessCheck)
 {
-    m_injectedScriptObject = injectedScriptObject;
+    m_injectedScriptValue = injectedScriptValue;
     m_inspectedStateAccessCheck = accessCheck;
 }
 
 bool InjectedScriptBase::canAccessInspectedWindow() const
 {
-    return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
+    return m_inspectedStateAccessCheck(m_injectedScriptValue.scriptState());
 }
 
-const ScriptObject& InjectedScriptBase::injectedScriptObject() const
+const ScriptValue& InjectedScriptBase::injectedScriptValue() const
 {
-    return m_injectedScriptObject;
+    return m_injectedScriptValue;
 }
 
 ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
 {
-    ExecutionContext* executionContext = m_injectedScriptObject.scriptState()->executionContext();
+    ExecutionContext* executionContext = m_injectedScriptValue.scriptState()->executionContext();
     TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", InspectorFunctionCallEvent::data(executionContext, 0, name(), 1));
     TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack());
     // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(executionContext, 0, name(), 1);
 
-    ScriptState* scriptState = m_injectedScriptObject.scriptState();
+    ScriptState* scriptState = m_injectedScriptValue.scriptState();
     bool evalIsDisabled = false;
     if (scriptState) {
         evalIsDisabled = !scriptState->evalEnabled();
         // Temporarily enable allow evals for inspector.
         if (evalIsDisabled)
             scriptState->setEvalEnabled(true);
     }
 
     ScriptValue resultValue = function.call(hadException);
 
@@ skipping 10 matching lines @@
     if (isEmpty() || !canAccessInspectedWindow()) {
         *result = JSONValue::null();
         return;
     }
 
     bool hadException = false;
     ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
 
     ASSERT(!hadException);
     if (!hadException) {
-        *result = resultValue.toJSONValue(m_injectedScriptObject.scriptState());
+        *result = resultValue.toJSONValue(m_injectedScriptValue.scriptState());
         if (!*result)
             *result = JSONString::create(String::format("Object has too long reference chain(must not be longer than %d)", JSONValue::maxDepth));
     } else {
         *result = JSONString::create("Exception while making a call.");
     }
 }
 
 void InjectedScriptBase::makeEvalCall(ErrorString* errorString, ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown)
 {
     RefPtr<JSONValue> result;
@@ skipping 17 matching lines @@
     if (!resultObj || !resultPair->getBoolean("wasThrown", &wasThrownVal)) {
         *errorString = "Internal error: result is not a pair of value and wasThrown flag";
         return;
     }
     *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
     *wasThrown = wasThrownVal;
 }
 
 } // namespace WebCore