Chromium Code Reviews| Index: Source/core/inspector/InjectedScriptBase.h |
| diff --git a/Source/core/inspector/InjectedScriptBase.h b/Source/core/inspector/InjectedScriptBase.h |
| index c7ae14bb5ec9c0522d4c85ea53327db8377b4be4..e9892e82e0e700a85a904200a6d95a540bbf3dfa 100644 |
| --- a/Source/core/inspector/InjectedScriptBase.h |
| +++ b/Source/core/inspector/InjectedScriptBase.h |
| @@ -32,8 +32,8 @@ |
| #define InjectedScriptBase_h |
| #include "InspectorTypeBuilder.h" |
| -#include "bindings/v8/ScriptObject.h" |
| #include "bindings/v8/ScriptState.h" |
| +#include "bindings/v8/ScriptValue.h" |
| #include "wtf/Forward.h" |
| namespace WebCore { |
| @@ -49,24 +49,24 @@ public: |
| virtual ~InjectedScriptBase() { } |
| const String& name() const { return m_name; } |
| - bool isEmpty() const { return m_injectedScriptObject.isEmpty(); } |
| - ScriptState* scriptState() const { return m_injectedScriptObject.scriptState(); } |
| + bool isEmpty() const { return m_injectedScriptValue.isEmpty(); } |
| + ScriptState* scriptState() const { return m_injectedScriptValue.scriptState(); } |
| protected: |
| typedef bool (*InspectedStateAccessCheck)(ScriptState*); |
| InjectedScriptBase(const String& name); |
| - InjectedScriptBase(const String& name, ScriptObject, InspectedStateAccessCheck); |
| + InjectedScriptBase(const String& name, ScriptValue, InspectedStateAccessCheck); |
| - void initialize(ScriptObject, InspectedStateAccessCheck); |
| + void initialize(ScriptValue, InspectedStateAccessCheck); |
| bool canAccessInspectedWindow() const; |
| - const ScriptObject& injectedScriptObject() const; |
| + const ScriptValue& injectedScriptValue() const; |
|
yurys
2014/05/21 06:09:55
injectedScriptObject might still be a better name
haraken
2014/05/21 06:45:10
Done.
|
| ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const; |
| void makeCall(ScriptFunctionCall&, RefPtr<JSONValue>* result); |
| void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown); |
| private: |
| String m_name; |
| - ScriptObject m_injectedScriptObject; |
| + ScriptValue m_injectedScriptValue; |
| InspectedStateAccessCheck m_inspectedStateAccessCheck; |
| }; |