Attachment #148392 for bug #89107

View Details Raw Unified Return to Bug 89107

| Differences between



2012-06-14  Andrey Adaikin  <aandrey@chromium.org>

        Web Inspector: Extract InjectedScriptBase class from the InjectedScript
        https://bugs.webkit.org/show_bug.cgi?id=89107

        Extract methods from the InjectedScript that do not depend on
        the concrete InjectedScriptSource.js implementation.

        Reviewed by NOBODY (OOPS!).

        * CMakeLists.txt:
        * GNUmakefile.list.am:
        * Target.pri:
        * WebCore.gypi:
        * WebCore.vcproj/WebCore.vcproj:
        * WebCore.xcodeproj/project.pbxproj:
        * inspector/InjectedScript.cpp:
        (WebCore::InjectedScript::InjectedScript):
        (WebCore::InjectedScript::evaluate):
        (WebCore::InjectedScript::callFunctionOn):
        (WebCore::InjectedScript::evaluateOnCallFrame):
        (WebCore::InjectedScript::getFunctionDetails):
        (WebCore::InjectedScript::getProperties):
        (WebCore::InjectedScript::nodeForObjectId):
        (WebCore::InjectedScript::releaseObject):
        (WebCore::InjectedScript::wrapCallFrames):
        (WebCore::InjectedScript::wrapObject):
        (WebCore::InjectedScript::wrapSerializedObject):
        (WebCore::InjectedScript::findObjectById):
        (WebCore::InjectedScript::inspectNode):
        (WebCore::InjectedScript::releaseObjectGroup):
        (WebCore::InjectedScript::nodeAsScriptValue):
        * inspector/InjectedScript.h:
        (WebCore):
        (InjectedScript):
        * inspector/InjectedScriptBase.cpp: Added.
        (WebCore):
        (WebCore::InjectedScriptBase::InjectedScriptBase):
        (WebCore::InjectedScriptBase::canAccessInspectedWindow):
        (WebCore::InjectedScriptBase::injectedScriptObject):
        (WebCore::InjectedScriptBase::callFunctionWithEvalEnabled):
        (WebCore::InjectedScriptBase::makeCall):
        (WebCore::InjectedScriptBase::makeEvalCall):
        * inspector/InjectedScriptBase.h: Copied from Source/WebCore/bindings/js/ScriptObject.h.
        (WebCore):
        (InjectedScriptBase):
        (WebCore::InjectedScriptBase::~InjectedScriptBase):
        (WebCore::InjectedScriptBase::hasNoValue):
        (WebCore::InjectedScriptBase::scriptState):
        * inspector/InspectorAllInOne.cpp:

2012-06-19  Abhishek Arya  <inferno@chromium.org>

        Crash in RenderInline::willBeDestroyed.

Lines 930-935 SET(WebCore_SOURCES a/Source/WebCore/CMakeLists.txt_sec1
- a/Source/WebCore/CMakeLists.txt +1 lines
930	inspector/DOMPatchSupport.cpp	930	inspector/DOMPatchSupport.cpp
931	inspector/IdentifiersFactory.cpp	931	inspector/IdentifiersFactory.cpp
932	inspector/InjectedScript.cpp	932	inspector/InjectedScript.cpp
		933	inspector/InjectedScriptBase.cpp
933	inspector/InjectedScriptHost.cpp	934	inspector/InjectedScriptHost.cpp
934	inspector/InjectedScriptManager.cpp	935	inspector/InjectedScriptManager.cpp
935	inspector/InspectorAgent.cpp	936	inspector/InspectorAgent.cpp

Lines 2655-2660 webcore_sources += \ a/Source/WebCore/GNUmakefile.list.am_sec1
- a/Source/WebCore/GNUmakefile.list.am +2 lines
2655	Source/WebCore/inspector/IdentifiersFactory.h \	2655	Source/WebCore/inspector/IdentifiersFactory.h \
2656	Source/WebCore/inspector/InjectedScript.cpp \	2656	Source/WebCore/inspector/InjectedScript.cpp \
2657	Source/WebCore/inspector/InjectedScript.h \	2657	Source/WebCore/inspector/InjectedScript.h \
		2658	Source/WebCore/inspector/InjectedScriptBase.cpp \
		2659	Source/WebCore/inspector/InjectedScriptBase.h \
2658	Source/WebCore/inspector/InjectedScriptHost.cpp \	2660	Source/WebCore/inspector/InjectedScriptHost.cpp \
2659	Source/WebCore/inspector/InjectedScriptHost.h \	2661	Source/WebCore/inspector/InjectedScriptHost.h \
2660	Source/WebCore/inspector/InjectedScriptManager.cpp \	2662	Source/WebCore/inspector/InjectedScriptManager.cpp \



    inspector/DOMPatchSupport.cpp \
    inspector/IdentifiersFactory.cpp \
    inspector/InjectedScript.cpp \
    inspector/InjectedScriptBase.cpp \
    inspector/InjectedScriptHost.cpp \
    inspector/InjectedScriptManager.cpp \
    inspector/InspectorAgent.cpp \

    inspector/DOMWrapperVisitor.h \
    inspector/IdentifiersFactory.h \
    inspector/InjectedScript.h \
    inspector/InjectedScriptBase.h \
    inspector/InjectedScriptHost.h \
    inspector/InjectedScriptManager.h \
    inspector/InspectorAgent.h \

Lines 2765-2770 a/Source/WebCore/WebCore.gypi_sec1
- a/Source/WebCore/WebCore.gypi +2 lines
2765	'inspector/IdentifiersFactory.h',	2765	'inspector/IdentifiersFactory.h',
2766	'inspector/InjectedScript.cpp',	2766	'inspector/InjectedScript.cpp',
2767	'inspector/InjectedScript.h',	2767	'inspector/InjectedScript.h',
		2768	'inspector/InjectedScriptBase.cpp',
		2769	'inspector/InjectedScriptBase.h',
2768	'inspector/InjectedScriptHost.cpp',	2770	'inspector/InjectedScriptHost.cpp',
2769	'inspector/InjectedScriptHost.h',	2771	'inspector/InjectedScriptHost.h',
2770	'inspector/InjectedScriptManager.cpp',	2772	'inspector/InjectedScriptManager.cpp',



				>
			</File>
			<File
				RelativePath="..\inspector\InjectedScriptBase.cpp"
				>
				<FileConfiguration
					Name="Release|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
				<FileConfiguration
					Name="Production|Win32"
					ExcludedFromBuild="true"
					>
					<Tool
						Name="VCCLCompilerTool"
					/>
				</FileConfiguration>
			</File>
			<File
				RelativePath="..\inspector\InjectedScriptBase.h"
				>
			</File>
			<File
				RelativePath="..\inspector\InjectedScriptHost.cpp"
				>
				<FileConfiguration



/*
 * 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


#include "InjectedScript.h"

#include "DOMWindow.h"
#include "Frame.h"
#include "InjectedScriptHost.h"
#include "InjectedScriptManager.h"
#include "InspectorInstrumentation.h"
#include "InspectorValues.h"
#include "Node.h"
#include "PlatformString.h"
#include "ScriptFunctionCall.h"
#include "SerializedScriptValue.h"

using WebCore::TypeBuilder::Array;
using WebCore::TypeBuilder::Debugger::CallFrame;

namespace WebCore {

InjectedScript::InjectedScript()
    : m_inspectedStateAccessCheck(0)
{
}

InjectedScript::InjectedScript(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
    : InjectedScriptBase(injectedScriptObject, accessCheck)
    , m_inspectedStateAccessCheck(accessCheck)
{
}

void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
{
    ScriptFunctionCall function(injectedScriptObject(), "evaluate");
    function.appendArgument(expression);
    function.appendArgument(objectGroup);
    function.appendArgument(includeCommandLineAPI);


void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
{
    ScriptFunctionCall function(injectedScriptObject(), "callFunctionOn");
    function.appendArgument(objectId);
    function.appendArgument(expression);
    function.appendArgument(arguments);


void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
{
    ScriptFunctionCall function(injectedScriptObject(), "evaluateOnCallFrame");
    function.appendArgument(callFrames);
    function.appendArgument(callFrameId);
    function.appendArgument(expression);


void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<FunctionDetails>* result)
{
    ScriptFunctionCall function(injectedScriptObject(), "getFunctionDetails");
    function.appendArgument(functionId);
    RefPtr<InspectorValue> resultValue;
    makeCall(function, &resultValue);


void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<PropertyDescriptor> >* properties)
{
    ScriptFunctionCall function(injectedScriptObject(), "getProperties");
    function.appendArgument(objectId);
    function.appendArgument(ownProperties);


    if (hasNoValue() || !canAccessInspectedWindow())
        return 0;

    ScriptFunctionCall function(injectedScriptObject(), "nodeForObjectId");
    function.appendArgument(objectId);

    bool hadException = false;


void InjectedScript::releaseObject(const String& objectId)
{
    ScriptFunctionCall function(injectedScriptObject(), "releaseObject");
    function.appendArgument(objectId);
    RefPtr<InspectorValue> result;
    makeCall(function, &result);

PassRefPtr<Array<CallFrame> > InjectedScript::wrapCallFrames(const ScriptValue& callFrames)
{
    ASSERT(!hasNoValue());
    ScriptFunctionCall function(injectedScriptObject(), "wrapCallFrames");
    function.appendArgument(callFrames);
    bool hadException = false;
    ScriptValue callFramesValue = callFunctionWithEvalEnabled(function, hadException);
    ASSERT(!hadException);
    RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(scriptState());
    if (result->type() == InspectorValue::TypeArray)
        return Array<CallFrame>::runtimeCast(result);
    return Array<CallFrame>::create();

PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(ScriptValue value, const String& groupName) const
{
    ASSERT(!hasNoValue());
    ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapObject");
    wrapFunction.appendArgument(value);
    wrapFunction.appendArgument(groupName);
    wrapFunction.appendArgument(canAccessInspectedWindow());

    if (hadException) {
        return 0;
    }
    RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
    return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
}



PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapSerializedObject(SerializedScriptValue* serializedScriptValue, const String& groupName) const
{
    ScriptValue scriptValue = serializedScriptValue->deserializeForInspector(scriptState());
    return scriptValue.hasNoValue() ? 0 : wrapObject(scriptValue, groupName);
}

ScriptValue InjectedScript::findObjectById(const String& objectId) const
{
    ASSERT(!hasNoValue());
    ScriptFunctionCall function(injectedScriptObject(), "findObjectById");
    function.appendArgument(objectId);

    bool hadException = false;

void InjectedScript::inspectNode(Node* node)
{
    ASSERT(!hasNoValue());
    ScriptFunctionCall function(injectedScriptObject(), "inspectNode");
    function.appendArgument(nodeAsScriptValue(node));
    RefPtr<InspectorValue> result;
    makeCall(function, &result);

void InjectedScript::releaseObjectGroup(const String& objectGroup)
{
    ASSERT(!hasNoValue());
    ScriptFunctionCall releaseFunction(injectedScriptObject(), "releaseObjectGroup");
    releaseFunction.appendArgument(objectGroup);
    bool hadException = false;
    callFunctionWithEvalEnabled(releaseFunction, hadException);
    ASSERT(!hadException);
}

bool InjectedScript::canAccessInspectedWindow() const
{
    return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
}

ScriptValue InjectedScript::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
{
    ScriptExecutionContext* scriptExecutionContext = scriptExecutionContextFromScriptState(m_injectedScriptObject.scriptState());
    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(scriptExecutionContext, "InjectedScript", 1);

    ScriptState* scriptState = m_injectedScriptObject.scriptState();
    bool evalIsDisabled = false;
    if (scriptState) {
        evalIsDisabled = !evalEnabled(scriptState);
        // Temporarily enable allow evals for inspector.
        if (evalIsDisabled)
            setEvalEnabled(scriptState, true);
    }

    ScriptValue resultValue = function.call(hadException);

    if (evalIsDisabled)
        setEvalEnabled(scriptState, false);

    InspectorInstrumentation::didCallFunction(cookie);
    return resultValue;
}

void InjectedScript::makeCall(ScriptFunctionCall& function, RefPtr<InspectorValue>* result)
{
    if (hasNoValue() || !canAccessInspectedWindow()) {
        *result = InspectorValue::null();
        return;
    }

    bool hadException = false;
    ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);

    ASSERT(!hadException);
    if (!hadException) {
        *result = resultValue.toInspectorValue(m_injectedScriptObject.scriptState());
        if (!*result)
            *result = InspectorString::create(String::format("Object has too long reference chain(must not be longer than %d)", InspectorValue::maxDepth));
    } else
        *result = InspectorString::create("Exception while making a call.");
}

void InjectedScript::makeEvalCall(ErrorString* errorString, ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown)
{
    RefPtr<InspectorValue> result;
    makeCall(function, &result);
    if (!result) {
        *errorString = "Internal error: result value is empty";
        return;
    }
    if (result->type() == InspectorValue::TypeString) {
        result->asString(errorString);
        return;
    }
    RefPtr<InspectorObject> resultPair = result->asObject();
    if (!resultPair) {
        *errorString = "Internal error: result is not an Object";
        return;
    }
    RefPtr<InspectorObject> 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;
    }
    *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
    *wasThrown = wasThrownVal;
}

ScriptValue InjectedScript::nodeAsScriptValue(Node* node)
{
    return InjectedScriptHost::nodeAsScriptValue(scriptState(), node);
}

} // namespace WebCore



/*
 * 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

#ifndef InjectedScript_h
#define InjectedScript_h

#include "InjectedScriptBase.h"
#include "InjectedScriptManager.h"
#include "InspectorTypeBuilder.h"
#include "ScriptObject.h"


namespace WebCore {

class InspectorArray;
class InspectorObject;
class InspectorValue;
class Node;
class SerializedScriptValue;

typedef String ErrorString;

#if ENABLE(INSPECTOR)

class InjectedScript : public InjectedScriptBase {
public:
    InjectedScript();
    ~InjectedScript() { }

    bool hasNoValue() const { return m_injectedScriptObject.hasNoValue(); }

    void evaluate(ErrorString*,
                  const String& expression,
                  const String& objectGroup,


    void inspectNode(Node*);
    void releaseObjectGroup(const String&);
    ScriptState* scriptState() const { return m_injectedScriptObject.scriptState(); }

private:
    friend InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState*);
    typedef bool (*InspectedStateAccessCheck)(ScriptState*);
    InjectedScript(ScriptObject, InspectedStateAccessCheck);

    bool canAccessInspectedWindow() const;
    ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const;
    void makeCall(ScriptFunctionCall&, RefPtr<InspectorValue>* result);
    void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);
    ScriptValue nodeAsScriptValue(Node*);

    ScriptObject m_injectedScriptObject;
    InspectedStateAccessCheck m_inspectedStateAccessCheck;
};

#endif



/*
 * 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
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#include "config.h"

#if ENABLE(INSPECTOR)

#include "InjectedScriptBase.h"

#include "InspectorInstrumentation.h"
#include "InspectorValues.h"
#include "PlatformString.h"
#include "ScriptFunctionCall.h"

using WebCore::TypeBuilder::Runtime::RemoteObject;

namespace WebCore {

InjectedScriptBase::InjectedScriptBase()
    : m_inspectedStateAccessCheck(0)
{
}

InjectedScriptBase::InjectedScriptBase(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
    : m_injectedScriptObject(injectedScriptObject)
    , m_inspectedStateAccessCheck(accessCheck)
{
}

bool InjectedScriptBase::canAccessInspectedWindow() const
{
    return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
}

const ScriptObject& InjectedScriptBase::injectedScriptObject() const
{
    return m_injectedScriptObject;
}

ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
{
    ScriptExecutionContext* scriptExecutionContext = scriptExecutionContextFromScriptState(m_injectedScriptObject.scriptState());
    InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(scriptExecutionContext, "InjectedScript", 1);

    ScriptState* scriptState = m_injectedScriptObject.scriptState();
    bool evalIsDisabled = false;
    if (scriptState) {
        evalIsDisabled = !evalEnabled(scriptState);
        // Temporarily enable allow evals for inspector.
        if (evalIsDisabled)
            setEvalEnabled(scriptState, true);
    }

    ScriptValue resultValue = function.call(hadException);

    if (evalIsDisabled)
        setEvalEnabled(scriptState, false);

    InspectorInstrumentation::didCallFunction(cookie);
    return resultValue;
}

void InjectedScriptBase::makeCall(ScriptFunctionCall& function, RefPtr<InspectorValue>* result)
{
    if (hasNoValue() || !canAccessInspectedWindow()) {
        *result = InspectorValue::null();
        return;
    }

    bool hadException = false;
    ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);

    ASSERT(!hadException);
    if (!hadException) {
        *result = resultValue.toInspectorValue(m_injectedScriptObject.scriptState());
        if (!*result)
            *result = InspectorString::create(String::format("Object has too long reference chain(must not be longer than %d)", InspectorValue::maxDepth));
    } else
        *result = InspectorString::create("Exception while making a call.");
}

void InjectedScriptBase::makeEvalCall(ErrorString* errorString, ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown)
{
    RefPtr<InspectorValue> result;
    makeCall(function, &result);
    if (!result) {
        *errorString = "Internal error: result value is empty";
        return;
    }
    if (result->type() == InspectorValue::TypeString) {
        result->asString(errorString);
        return;
    }
    RefPtr<InspectorObject> resultPair = result->asObject();
    if (!resultPair) {
        *errorString = "Internal error: result is not an Object";
        return;
    }
    RefPtr<InspectorObject> 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;
    }
    *objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
    *wasThrown = wasThrownVal;
}

} // namespace WebCore

#endif // ENABLE(INSPECTOR)



/*
 * 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
 * copyright notice, this list of conditions and the following disclaimer
 * in the documentation and/or other materials provided with the
 * distribution.
 *     * Neither the name of Google Inc. nor the names of its
 * contributors may be used to endorse or promote products derived from
 * this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

#ifndef InjectedScriptBase_h
#define InjectedScriptBase_h

#include "InspectorTypeBuilder.h"
#include "ScriptObject.h"
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>

namespace WebCore {

class InspectorValue;
class ScriptFunctionCall;

typedef String ErrorString;

#if ENABLE(INSPECTOR)

class InjectedScriptBase {
public:
    virtual ~InjectedScriptBase() { }

    bool hasNoValue() const { return m_injectedScriptObject.hasNoValue(); }
    ScriptState* scriptState() const { return m_injectedScriptObject.scriptState(); }

protected:
    typedef bool (*InspectedStateAccessCheck)(ScriptState*);
    InjectedScriptBase();
    InjectedScriptBase(ScriptObject, InspectedStateAccessCheck);

    bool canAccessInspectedWindow() const;
    const ScriptObject& injectedScriptObject() const;
    ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const;
    void makeCall(ScriptFunctionCall&, RefPtr<InspectorValue>* result);
    void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown);

private:
    ScriptObject m_injectedScriptObject;
    InspectedStateAccessCheck m_inspectedStateAccessCheck;
};

#endif

} // namespace WebCore

#endif

Lines 32-37 a/Source/WebCore/inspector/InspectorAllInOne.cpp_sec1
- a/Source/WebCore/inspector/InspectorAllInOne.cpp +1 lines
32	#include "DOMPatchSupport.cpp"	32	#include "DOMPatchSupport.cpp"
33	#include "IdentifiersFactory.cpp"	33	#include "IdentifiersFactory.cpp"
34	#include "InjectedScript.cpp"	34	#include "InjectedScript.cpp"
		35	#include "InjectedScriptBase.cpp"
35	#include "InjectedScriptHost.cpp"	36	#include "InjectedScriptHost.cpp"
36	#include "InjectedScriptManager.cpp"	37	#include "InjectedScriptManager.cpp"
37	#include "InspectorAgent.cpp"	38	#include "InspectorAgent.cpp"

Return to Bug 89107

Lines 73331-73336 a/Source/WebCore/WebCore.vcproj/WebCore.vcproj_sec1
- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj +24 lines
73331	>	73331	>
73332	</File>	73332	</File>
73333	<File	73333	<File
		73334	RelativePath="..\inspector\InjectedScriptBase.cpp"
		73335	>
		73336	<FileConfiguration
		73337	Name="Release\|Win32"
		73338	ExcludedFromBuild="true"
		73339	>
		73340	<Tool
		73341	Name="VCCLCompilerTool"
		73342	/>
		73343	</FileConfiguration>
		73344	<FileConfiguration
		73345	Name="Production\|Win32"
		73346	ExcludedFromBuild="true"
		73347	>
		73348	<Tool
		73349	Name="VCCLCompilerTool"
		73350	/>
		73351	</FileConfiguration>
		73352	</File>
		73353	<File
		73354	RelativePath="..\inspector\InjectedScriptBase.h"
		73355	>
		73356	</File>
		73357	<File
73334	RelativePath="..\inspector\InjectedScriptHost.cpp"	73358	RelativePath="..\inspector\InjectedScriptHost.cpp"
73335	>	73359	>
73336	<FileConfiguration	73360	<FileConfiguration

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +51 lines
		1	2012-06-14 Andrey Adaikin <aandrey@chromium.org>
		2
		3	Web Inspector: Extract InjectedScriptBase class from the InjectedScript
		4	https://bugs.webkit.org/show_bug.cgi?id=89107
		5
		6	Extract methods from the InjectedScript that do not depend on
		7	the concrete InjectedScriptSource.js implementation.
		8
		9	Reviewed by NOBODY (OOPS!).
		10
		11	* CMakeLists.txt:
		12	* GNUmakefile.list.am:
		13	* Target.pri:
		14	* WebCore.gypi:
		15	* WebCore.vcproj/WebCore.vcproj:
		16	* WebCore.xcodeproj/project.pbxproj:
		17	* inspector/InjectedScript.cpp:
		18	(WebCore::InjectedScript::InjectedScript):
		19	(WebCore::InjectedScript::evaluate):
		20	(WebCore::InjectedScript::callFunctionOn):
		21	(WebCore::InjectedScript::evaluateOnCallFrame):
		22	(WebCore::InjectedScript::getFunctionDetails):
		23	(WebCore::InjectedScript::getProperties):
		24	(WebCore::InjectedScript::nodeForObjectId):
		25	(WebCore::InjectedScript::releaseObject):
		26	(WebCore::InjectedScript::wrapCallFrames):
		27	(WebCore::InjectedScript::wrapObject):
		28	(WebCore::InjectedScript::wrapSerializedObject):
		29	(WebCore::InjectedScript::findObjectById):
		30	(WebCore::InjectedScript::inspectNode):
		31	(WebCore::InjectedScript::releaseObjectGroup):
		32	(WebCore::InjectedScript::nodeAsScriptValue):
		33	* inspector/InjectedScript.h:
		34	(WebCore):
		35	(InjectedScript):
		36	* inspector/InjectedScriptBase.cpp: Added.
		37	(WebCore):
		38	(WebCore::InjectedScriptBase::InjectedScriptBase):
		39	(WebCore::InjectedScriptBase::canAccessInspectedWindow):
		40	(WebCore::InjectedScriptBase::injectedScriptObject):
		41	(WebCore::InjectedScriptBase::callFunctionWithEvalEnabled):
		42	(WebCore::InjectedScriptBase::makeCall):
		43	(WebCore::InjectedScriptBase::makeEvalCall):
		44	* inspector/InjectedScriptBase.h: Copied from Source/WebCore/bindings/js/ScriptObject.h.
		45	(WebCore):
		46	(InjectedScriptBase):
		47	(WebCore::InjectedScriptBase::~InjectedScriptBase):
		48	(WebCore::InjectedScriptBase::hasNoValue):
		49	(WebCore::InjectedScriptBase::scriptState):
		50	* inspector/InspectorAllInOne.cpp:
		51
1	2012-06-19 Abhishek Arya <inferno@chromium.org>	52	2012-06-19 Abhishek Arya <inferno@chromium.org>
2		53
3	Crash in RenderInline::willBeDestroyed.	54	Crash in RenderInline::willBeDestroyed.

Lines 891-896 SOURCES += \ a/Source/WebCore/Target.pri_sec1
- a/Source/WebCore/Target.pri +2 lines
891	inspector/DOMPatchSupport.cpp \	891	inspector/DOMPatchSupport.cpp \
892	inspector/IdentifiersFactory.cpp \	892	inspector/IdentifiersFactory.cpp \
893	inspector/InjectedScript.cpp \	893	inspector/InjectedScript.cpp \
		894	inspector/InjectedScriptBase.cpp \
894	inspector/InjectedScriptHost.cpp \	895	inspector/InjectedScriptHost.cpp \
895	inspector/InjectedScriptManager.cpp \	896	inspector/InjectedScriptManager.cpp \
896	inspector/InspectorAgent.cpp \	897	inspector/InspectorAgent.cpp \
Lines 2038-2043 HEADERS += \ a/Source/WebCore/Target.pri_sec2
2038	inspector/DOMWrapperVisitor.h \	2039	inspector/DOMWrapperVisitor.h \
2039	inspector/IdentifiersFactory.h \	2040	inspector/IdentifiersFactory.h \
2040	inspector/InjectedScript.h \	2041	inspector/InjectedScript.h \
		2042	inspector/InjectedScriptBase.h \
2041	inspector/InjectedScriptHost.h \	2043	inspector/InjectedScriptHost.h \
2042	inspector/InjectedScriptManager.h \	2044	inspector/InjectedScriptManager.h \
2043	inspector/InspectorAgent.h \	2045	inspector/InspectorAgent.h \

Lines 4463-4468 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +8 lines
4463	AA21ECCD0ABF0FC6002B834C /* CSSCursorImageValue.h in Headers / = {isa = PBXBuildFile; fileRef = AA0978EE0ABAA6E100874480 / CSSCursorImageValue.h */; settings = {ATTRIBUTES = (Private, ); }; };	4463	AA21ECCD0ABF0FC6002B834C /* CSSCursorImageValue.h in Headers / = {isa = PBXBuildFile; fileRef = AA0978EE0ABAA6E100874480 / CSSCursorImageValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
4464	AA4C3A760B2B1679002334A2 /* StyleElement.cpp in Sources / = {isa = PBXBuildFile; fileRef = AA4C3A740B2B1679002334A2 / StyleElement.cpp */; };	4464	AA4C3A760B2B1679002334A2 /* StyleElement.cpp in Sources / = {isa = PBXBuildFile; fileRef = AA4C3A740B2B1679002334A2 / StyleElement.cpp */; };
4465	AA4C3A770B2B1679002334A2 /* StyleElement.h in Headers / = {isa = PBXBuildFile; fileRef = AA4C3A750B2B1679002334A2 / StyleElement.h */; };	4465	AA4C3A770B2B1679002334A2 /* StyleElement.h in Headers / = {isa = PBXBuildFile; fileRef = AA4C3A750B2B1679002334A2 / StyleElement.h */; };
		4466	AAB6054E15874C58007B5031 /* InjectedScriptBase.cpp in Sources / = {isa = PBXBuildFile; fileRef = AAB6054A15874C58007B5031 / InjectedScriptBase.cpp */; };
		4467	AAB6054F15874C58007B5031 /* InjectedScriptBase.h in Headers / = {isa = PBXBuildFile; fileRef = AAB6054B15874C58007B5031 / InjectedScriptBase.h */; };
4466	AAD766EB157E502F00E85423 /* InspectorWebGLAgent.cpp in Sources / = {isa = PBXBuildFile; fileRef = AAD766E8157E502F00E85423 / InspectorWebGLAgent.cpp */; };	4468	AAD766EB157E502F00E85423 /* InspectorWebGLAgent.cpp in Sources / = {isa = PBXBuildFile; fileRef = AAD766E8157E502F00E85423 / InspectorWebGLAgent.cpp */; };
4467	AAD766EC157E502F00E85423 /* InspectorWebGLAgent.h in Headers / = {isa = PBXBuildFile; fileRef = AAD766E9157E502F00E85423 / InspectorWebGLAgent.h */; };	4469	AAD766EC157E502F00E85423 /* InspectorWebGLAgent.h in Headers / = {isa = PBXBuildFile; fileRef = AAD766E9157E502F00E85423 / InspectorWebGLAgent.h */; };
4468	AAD766ED157E502F00E85423 /* InspectorWebGLInstrumentation.h in Headers / = {isa = PBXBuildFile; fileRef = AAD766EA157E502F00E85423 / InspectorWebGLInstrumentation.h */; };	4470	AAD766ED157E502F00E85423 /* InspectorWebGLInstrumentation.h in Headers / = {isa = PBXBuildFile; fileRef = AAD766EA157E502F00E85423 / InspectorWebGLInstrumentation.h */; };
Lines 11472-11477 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
11472	AA4C3A750B2B1679002334A2 /* StyleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StyleElement.h; sourceTree = "<group>"; };	11474	AA4C3A750B2B1679002334A2 /* StyleElement.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StyleElement.h; sourceTree = "<group>"; };
11473	AA9030FE157E16A000276247 /* InjectedWebGLScriptSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedWebGLScriptSource.js; sourceTree = "<group>"; };	11475	AA9030FE157E16A000276247 /* InjectedWebGLScriptSource.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InjectedWebGLScriptSource.js; sourceTree = "<group>"; };
11474	AA912750157E35A500454E54 /* InjectedWebGLScriptSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedWebGLScriptSource.h; sourceTree = "<group>"; };	11476	AA912750157E35A500454E54 /* InjectedWebGLScriptSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedWebGLScriptSource.h; sourceTree = "<group>"; };
		11477	AAB6054A15874C58007B5031 /* InjectedScriptBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptBase.cpp; sourceTree = "<group>"; };
		11478	AAB6054B15874C58007B5031 /* InjectedScriptBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptBase.h; sourceTree = "<group>"; };
11475	AAD766E8157E502F00E85423 /* InspectorWebGLAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWebGLAgent.cpp; sourceTree = "<group>"; };	11479	AAD766E8157E502F00E85423 /* InspectorWebGLAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWebGLAgent.cpp; sourceTree = "<group>"; };
11476	AAD766E9157E502F00E85423 /* InspectorWebGLAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebGLAgent.h; sourceTree = "<group>"; };	11480	AAD766E9157E502F00E85423 /* InspectorWebGLAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebGLAgent.h; sourceTree = "<group>"; };
11477	AAD766EA157E502F00E85423 /* InspectorWebGLInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebGLInstrumentation.h; sourceTree = "<group>"; };	11481	AAD766EA157E502F00E85423 /* InspectorWebGLInstrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebGLInstrumentation.h; sourceTree = "<group>"; };
Lines 14401-14406 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec3
14401	5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */,	14405	5913A24013D49EBA00F5B05C /* IdentifiersFactory.h */,
14402	F3644AFD1119805900E0D537 /* InjectedScript.cpp */,	14406	F3644AFD1119805900E0D537 /* InjectedScript.cpp */,
14403	F3644AFE1119805900E0D537 /* InjectedScript.h */,	14407	F3644AFE1119805900E0D537 /* InjectedScript.h */,
		14408	AAB6054A15874C58007B5031 /* InjectedScriptBase.cpp */,
		14409	AAB6054B15874C58007B5031 /* InjectedScriptBase.h */,
14404	7A0E76F610BF08ED00A0276E /* InjectedScriptHost.cpp */,	14410	7A0E76F610BF08ED00A0276E /* InjectedScriptHost.cpp */,
14405	7A0E76F710BF08ED00A0276E /* InjectedScriptHost.h */,	14411	7A0E76F710BF08ED00A0276E /* InjectedScriptHost.h */,
14406	7A0E76F810BF08ED00A0276E /* InjectedScriptHost.idl */,	14412	7A0E76F810BF08ED00A0276E /* InjectedScriptHost.idl */,
Lines 23317-23322 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec4
23317	316FE1180E6E1DA700BF6088 /* ImplicitAnimation.h in Headers */,	23323	316FE1180E6E1DA700BF6088 /* ImplicitAnimation.h in Headers */,
23318	DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */,	23324	DB23C2CC0A508D29002489EB /* IndentOutdentCommand.h in Headers */,
23319	F3644B001119805900E0D537 /* InjectedScript.h in Headers */,	23325	F3644B001119805900E0D537 /* InjectedScript.h in Headers */,
		23326	AAB6054F15874C58007B5031 /* InjectedScriptBase.h in Headers */,
23320	7A0E76FA10BF08ED00A0276E /* InjectedScriptHost.h in Headers */,	23327	7A0E76FA10BF08ED00A0276E /* InjectedScriptHost.h in Headers */,
23321	F316396C1329481A00A649CB /* InjectedScriptManager.h in Headers */,	23328	F316396C1329481A00A649CB /* InjectedScriptManager.h in Headers */,
23322	A8CFF5E50A155A05000A4234 /* InlineBox.h in Headers */,	23329	A8CFF5E50A155A05000A4234 /* InlineBox.h in Headers */,
Lines 26454-26459 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec5
26454	316FE1170E6E1DA700BF6088 /* ImplicitAnimation.cpp in Sources */,	26461	316FE1170E6E1DA700BF6088 /* ImplicitAnimation.cpp in Sources */,
26455	DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */,	26462	DB23C2CB0A508D29002489EB /* IndentOutdentCommand.cpp in Sources */,
26456	F3644AFF1119805900E0D537 /* InjectedScript.cpp in Sources */,	26463	F3644AFF1119805900E0D537 /* InjectedScript.cpp in Sources */,
		26464	AAB6054E15874C58007B5031 /* InjectedScriptBase.cpp in Sources */,
26457	7A0E76F910BF08ED00A0276E /* InjectedScriptHost.cpp in Sources */,	26465	7A0E76F910BF08ED00A0276E /* InjectedScriptHost.cpp in Sources */,
26458	F316396B1329481A00A649CB /* InjectedScriptManager.cpp in Sources */,	26466	F316396B1329481A00A649CB /* InjectedScriptManager.cpp in Sources */,
26459	A8CFF5E60A155A05000A4234 /* InlineBox.cpp in Sources */,	26467	A8CFF5E60A155A05000A4234 /* InlineBox.cpp in Sources */,

Lines 1-5 a/Source/WebCore/inspector/InjectedScript.cpp_sec1
- a/Source/WebCore/inspector/InjectedScript.cpp -98 / +19 lines
1	/*	1	/*
2	* Copyright (C) 2010, 2011 Google Inc. All rights reserved.	2	* Copyright (C) 2012 Google Inc. All rights reserved.
3	*	3	*
4	* Redistribution and use in source and binary forms, with or without	4	* Redistribution and use in source and binary forms, with or without
5	* modification, are permitted provided that the following conditions are	5	* modification, are permitted provided that the following conditions are
Lines 34-48 a/Source/WebCore/inspector/InjectedScript.cpp_sec2
34		34
35	#include "InjectedScript.h"	35	#include "InjectedScript.h"
36		36
37	#include "DOMWindow.h"
38	#include "Frame.h"
39	#include "InjectedScriptHost.h"	37	#include "InjectedScriptHost.h"
40	#include "InjectedScriptManager.h"
41	#include "InspectorInstrumentation.h"
42	#include "InspectorValues.h"	38	#include "InspectorValues.h"
43	#include "Node.h"	39	#include "Node.h"
44	#include "PlatformString.h"	40	#include "PlatformString.h"
45	#include "ScriptFunctionCall.h"	41	#include "ScriptFunctionCall.h"
		42	#include "SerializedScriptValue.h"
46		43
47	using WebCore::TypeBuilder::Array;	44	using WebCore::TypeBuilder::Array;
48	using WebCore::TypeBuilder::Debugger::CallFrame;	45	using WebCore::TypeBuilder::Debugger::CallFrame;
Lines 53-71 using WebCore::TypeBuilder::Runtime::RemoteObject; a/Source/WebCore/inspector/InjectedScript.cpp_sec3
53	namespace WebCore {	50	namespace WebCore {
54		51
55	InjectedScript::InjectedScript()	52	InjectedScript::InjectedScript()
56	: m_inspectedStateAccessCheck(0)
57	{	53	{
58	}	54	}
59		55
60	InjectedScript::InjectedScript(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)	56	InjectedScript::InjectedScript(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
61	: m_injectedScriptObject(injectedScriptObject)	57	: InjectedScriptBase(injectedScriptObject, accessCheck)
62	, m_inspectedStateAccessCheck(accessCheck)
63	{	58	{
64	}	59	}
65		60
66	void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)	61	void InjectedScript::evaluate(ErrorString* errorString, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
67	{	62	{
68	ScriptFunctionCall function(m_injectedScriptObject, "evaluate");	63	ScriptFunctionCall function(injectedScriptObject(), "evaluate");
69	function.appendArgument(expression);	64	function.appendArgument(expression);
70	function.appendArgument(objectGroup);	65	function.appendArgument(objectGroup);
71	function.appendArgument(includeCommandLineAPI);	66	function.appendArgument(includeCommandLineAPI);
Lines 75-81 void InjectedScript::evaluate(ErrorString* errorString, const String& expression a/Source/WebCore/inspector/InjectedScript.cpp_sec4
75		70
76	void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)	71	void InjectedScript::callFunctionOn(ErrorString* errorString, const String& objectId, const String& expression, const String& arguments, bool returnByValue, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
77	{	72	{
78	ScriptFunctionCall function(m_injectedScriptObject, "callFunctionOn");	73	ScriptFunctionCall function(injectedScriptObject(), "callFunctionOn");
79	function.appendArgument(objectId);	74	function.appendArgument(objectId);
80	function.appendArgument(expression);	75	function.appendArgument(expression);
81	function.appendArgument(arguments);	76	function.appendArgument(arguments);
Lines 85-91 void InjectedScript::callFunctionOn(ErrorString* errorString, const String& obje a/Source/WebCore/inspector/InjectedScript.cpp_sec5
85		80
86	void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)	81	void InjectedScript::evaluateOnCallFrame(ErrorString* errorString, const ScriptValue& callFrames, const String& callFrameId, const String& expression, const String& objectGroup, bool includeCommandLineAPI, bool returnByValue, RefPtr<RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown)
87	{	82	{
88	ScriptFunctionCall function(m_injectedScriptObject, "evaluateOnCallFrame");	83	ScriptFunctionCall function(injectedScriptObject(), "evaluateOnCallFrame");
89	function.appendArgument(callFrames);	84	function.appendArgument(callFrames);
90	function.appendArgument(callFrameId);	85	function.appendArgument(callFrameId);
91	function.appendArgument(expression);	86	function.appendArgument(expression);
Lines 117-123 void InjectedScript::restartFrame(ErrorString* errorString, const ScriptValue& c a/Source/WebCore/inspector/InjectedScript.cpp_sec6
117		112
118	void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<FunctionDetails>* result)	113	void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& functionId, RefPtr<FunctionDetails>* result)
119	{	114	{
120	ScriptFunctionCall function(m_injectedScriptObject, "getFunctionDetails");	115	ScriptFunctionCall function(injectedScriptObject(), "getFunctionDetails");
121	function.appendArgument(functionId);	116	function.appendArgument(functionId);
122	RefPtr<InspectorValue> resultValue;	117	RefPtr<InspectorValue> resultValue;
123	makeCall(function, &resultValue);	118	makeCall(function, &resultValue);
Lines 131-137 void InjectedScript::getFunctionDetails(ErrorString* errorString, const String& a/Source/WebCore/inspector/InjectedScript.cpp_sec7
131		126
132	void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<PropertyDescriptor> >* properties)	127	void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<PropertyDescriptor> >* properties)
133	{	128	{
134	ScriptFunctionCall function(m_injectedScriptObject, "getProperties");	129	ScriptFunctionCall function(injectedScriptObject(), "getProperties");
135	function.appendArgument(objectId);	130	function.appendArgument(objectId);
136	function.appendArgument(ownProperties);	131	function.appendArgument(ownProperties);
137		132
Lines 149-155 Node* InjectedScript::nodeForObjectId(const String& objectId) a/Source/WebCore/inspector/InjectedScript.cpp_sec8
149	if (hasNoValue() \|\| !canAccessInspectedWindow())	144	if (hasNoValue() \|\| !canAccessInspectedWindow())
150	return 0;	145	return 0;
151		146
152	ScriptFunctionCall function(m_injectedScriptObject, "nodeForObjectId");	147	ScriptFunctionCall function(injectedScriptObject(), "nodeForObjectId");
153	function.appendArgument(objectId);	148	function.appendArgument(objectId);
154		149
155	bool hadException = false;	150	bool hadException = false;
Lines 161-167 Node* InjectedScript::nodeForObjectId(const String& objectId) a/Source/WebCore/inspector/InjectedScript.cpp_sec9
161		156
162	void InjectedScript::releaseObject(const String& objectId)	157	void InjectedScript::releaseObject(const String& objectId)
163	{	158	{
164	ScriptFunctionCall function(m_injectedScriptObject, "releaseObject");	159	ScriptFunctionCall function(injectedScriptObject(), "releaseObject");
165	function.appendArgument(objectId);	160	function.appendArgument(objectId);
166	RefPtr<InspectorValue> result;	161	RefPtr<InspectorValue> result;
167	makeCall(function, &result);	162	makeCall(function, &result);
Lines 171-182 void InjectedScript::releaseObject(const String& objectId) a/Source/WebCore/inspector/InjectedScript.cpp_sec10
171	PassRefPtr<Array<CallFrame> > InjectedScript::wrapCallFrames(const ScriptValue& callFrames)	166	PassRefPtr<Array<CallFrame> > InjectedScript::wrapCallFrames(const ScriptValue& callFrames)
172	{	167	{
173	ASSERT(!hasNoValue());	168	ASSERT(!hasNoValue());
174	ScriptFunctionCall function(m_injectedScriptObject, "wrapCallFrames");	169	ScriptFunctionCall function(injectedScriptObject(), "wrapCallFrames");
175	function.appendArgument(callFrames);	170	function.appendArgument(callFrames);
176	bool hadException = false;	171	bool hadException = false;
177	ScriptValue callFramesValue = callFunctionWithEvalEnabled(function, hadException);	172	ScriptValue callFramesValue = callFunctionWithEvalEnabled(function, hadException);
178	ASSERT(!hadException);	173	ASSERT(!hadException);
179	RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(m_injectedScriptObject.scriptState());	174	RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(scriptState());
180	if (result->type() == InspectorValue::TypeArray)	175	if (result->type() == InspectorValue::TypeArray)
181	return Array<CallFrame>::runtimeCast(result);	176	return Array<CallFrame>::runtimeCast(result);
182	return Array<CallFrame>::create();	177	return Array<CallFrame>::create();
Lines 186-192 PassRefPtr<Array<CallFrame> > InjectedScript::wrapCallFrames(const ScriptValue& a/Source/WebCore/inspector/InjectedScript.cpp_sec11
186	PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(ScriptValue value, const String& groupName) const	181	PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(ScriptValue value, const String& groupName) const
187	{	182	{
188	ASSERT(!hasNoValue());	183	ASSERT(!hasNoValue());
189	ScriptFunctionCall wrapFunction(m_injectedScriptObject, "wrapObject");	184	ScriptFunctionCall wrapFunction(injectedScriptObject(), "wrapObject");
190	wrapFunction.appendArgument(value);	185	wrapFunction.appendArgument(value);
191	wrapFunction.appendArgument(groupName);	186	wrapFunction.appendArgument(groupName);
192	wrapFunction.appendArgument(canAccessInspectedWindow());	187	wrapFunction.appendArgument(canAccessInspectedWindow());
Lines 195-201 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapObject(Script a/Source/WebCore/inspector/InjectedScript.cpp_sec12
195	if (hadException) {	190	if (hadException) {
196	return 0;	191	return 0;
197	}	192	}
198	RefPtr<InspectorObject> rawResult = r.toInspectorValue(m_injectedScriptObject.scriptState())->asObject();	193	RefPtr<InspectorObject> rawResult = r.toInspectorValue(scriptState())->asObject();
199	return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);	194	return TypeBuilder::Runtime::RemoteObject::runtimeCast(rawResult);
200	}	195	}
201		196
Lines 206-219 PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapNode(Node* no a/Source/WebCore/inspector/InjectedScript.cpp_sec13
206		201
207	PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapSerializedObject(SerializedScriptValue* serializedScriptValue, const String& groupName) const	202	PassRefPtr<TypeBuilder::Runtime::RemoteObject> InjectedScript::wrapSerializedObject(SerializedScriptValue* serializedScriptValue, const String& groupName) const
208	{	203	{
209	ScriptValue scriptValue = serializedScriptValue->deserializeForInspector(m_injectedScriptObject.scriptState());	204	ScriptValue scriptValue = serializedScriptValue->deserializeForInspector(scriptState());
210	return scriptValue.hasNoValue() ? 0 : wrapObject(scriptValue, groupName);	205	return scriptValue.hasNoValue() ? 0 : wrapObject(scriptValue, groupName);
211	}	206	}
212		207
213	ScriptValue InjectedScript::findObjectById(const String& objectId) const	208	ScriptValue InjectedScript::findObjectById(const String& objectId) const
214	{	209	{
215	ASSERT(!hasNoValue());	210	ASSERT(!hasNoValue());
216	ScriptFunctionCall function(m_injectedScriptObject, "findObjectById");	211	ScriptFunctionCall function(injectedScriptObject(), "findObjectById");
217	function.appendArgument(objectId);	212	function.appendArgument(objectId);
218		213
219	bool hadException = false;	214	bool hadException = false;
Lines 225-231 ScriptValue InjectedScript::findObjectById(const String& objectId) const a/Source/WebCore/inspector/InjectedScript.cpp_sec14
225	void InjectedScript::inspectNode(Node* node)	220	void InjectedScript::inspectNode(Node* node)
226	{	221	{
227	ASSERT(!hasNoValue());	222	ASSERT(!hasNoValue());
228	ScriptFunctionCall function(m_injectedScriptObject, "inspectNode");	223	ScriptFunctionCall function(injectedScriptObject(), "inspectNode");
229	function.appendArgument(nodeAsScriptValue(node));	224	function.appendArgument(nodeAsScriptValue(node));
230	RefPtr<InspectorValue> result;	225	RefPtr<InspectorValue> result;
231	makeCall(function, &result);	226	makeCall(function, &result);
Lines 234-323 void InjectedScript::inspectNode(Node* node) a/Source/WebCore/inspector/InjectedScript.cpp_sec15
234	void InjectedScript::releaseObjectGroup(const String& objectGroup)	229	void InjectedScript::releaseObjectGroup(const String& objectGroup)
235	{	230	{
236	ASSERT(!hasNoValue());	231	ASSERT(!hasNoValue());
237	ScriptFunctionCall releaseFunction(m_injectedScriptObject, "releaseObjectGroup");	232	ScriptFunctionCall releaseFunction(injectedScriptObject(), "releaseObjectGroup");
238	releaseFunction.appendArgument(objectGroup);	233	releaseFunction.appendArgument(objectGroup);
239	bool hadException = false;	234	bool hadException = false;
240	callFunctionWithEvalEnabled(releaseFunction, hadException);	235	callFunctionWithEvalEnabled(releaseFunction, hadException);
241	ASSERT(!hadException);	236	ASSERT(!hadException);
242	}	237	}
243		238
244	bool InjectedScript::canAccessInspectedWindow() const
245	{
246	return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
247	}
248
249	ScriptValue InjectedScript::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const
250	{
251	ScriptExecutionContext* scriptExecutionContext = scriptExecutionContextFromScriptState(m_injectedScriptObject.scriptState());
252	InspectorInstrumentationCookie cookie = InspectorInstrumentation::willCallFunction(scriptExecutionContext, "InjectedScript", 1);
253
254	ScriptState* scriptState = m_injectedScriptObject.scriptState();
255	bool evalIsDisabled = false;
256	if (scriptState) {
257	evalIsDisabled = !evalEnabled(scriptState);
258	// Temporarily enable allow evals for inspector.
259	if (evalIsDisabled)
260	setEvalEnabled(scriptState, true);
261	}
262
263	ScriptValue resultValue = function.call(hadException);
264
265	if (evalIsDisabled)
266	setEvalEnabled(scriptState, false);
267
268	InspectorInstrumentation::didCallFunction(cookie);
269	return resultValue;
270	}
271
272	void InjectedScript::makeCall(ScriptFunctionCall& function, RefPtr<InspectorValue>* result)
273	{
274	if (hasNoValue() \|\| !canAccessInspectedWindow()) {
275	*result = InspectorValue::null();
276	return;
277	}
278
279	bool hadException = false;
280	ScriptValue resultValue = callFunctionWithEvalEnabled(function, hadException);
281
282	ASSERT(!hadException);
283	if (!hadException) {
284	*result = resultValue.toInspectorValue(m_injectedScriptObject.scriptState());
285	if (!*result)
286	*result = InspectorString::create(String::format("Object has too long reference chain(must not be longer than %d)", InspectorValue::maxDepth));
287	} else
288	*result = InspectorString::create("Exception while making a call.");
289	}
290
291	void InjectedScript::makeEvalCall(ErrorString* errorString, ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown)
292	{
293	RefPtr<InspectorValue> result;
294	makeCall(function, &result);
295	if (!result) {
296	*errorString = "Internal error: result value is empty";
297	return;
298	}
299	if (result->type() == InspectorValue::TypeString) {
300	result->asString(errorString);
301	return;
302	}
303	RefPtr<InspectorObject> resultPair = result->asObject();
304	if (!resultPair) {
305	*errorString = "Internal error: result is not an Object";
306	return;
307	}
308	RefPtr<InspectorObject> resultObj = resultPair->getObject("result");
309	bool wasThrownVal = false;
310	if (!resultObj \|\| !resultPair->getBoolean("wasThrown", &wasThrownVal)) {
311	*errorString = "Internal error: result is not a pair of value and wasThrown flag";
312	return;
313	}
314	*objectResult = TypeBuilder::Runtime::RemoteObject::runtimeCast(resultObj);
315	*wasThrown = wasThrownVal;
316	}
317
318	ScriptValue InjectedScript::nodeAsScriptValue(Node* node)	239	ScriptValue InjectedScript::nodeAsScriptValue(Node* node)
319	{	240	{
320	return InjectedScriptHost::nodeAsScriptValue(m_injectedScriptObject.scriptState(), node);	241	return InjectedScriptHost::nodeAsScriptValue(scriptState(), node);
321	}	242	}
322		243
323	} // namespace WebCore	244	} // namespace WebCore