Index: Source/core/inspector/InjectedScriptBase.cpp |
diff --git a/Source/core/inspector/InjectedScriptBase.cpp b/Source/core/inspector/InjectedScriptBase.cpp |
index cf05edd354eb3fb97b18319ee1579c3c77183a3b..4c6f7505410fb262ca6e0ce60275f7fdda624535 100644 |
--- a/Source/core/inspector/InjectedScriptBase.cpp |
+++ b/Source/core/inspector/InjectedScriptBase.cpp |
@@ -43,36 +43,36 @@ using WebCore::TypeBuilder::Runtime::RemoteObject; |
namespace WebCore { |
-InjectedScriptBase::InjectedScriptBase(const String& name) |
- : m_name(name) |
- , m_inspectedStateAccessCheck(0) |
+bool V8InjectedScriptBase::canAccessInspectedWindow() const |
{ |
+ return m_inspectedStateAccessCheck(scriptState()); |
} |
-InjectedScriptBase::InjectedScriptBase(const String& name, ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck) |
- : m_name(name) |
- , m_injectedScriptObject(injectedScriptObject) |
- , m_inspectedStateAccessCheck(accessCheck) |
+void V8InjectedScriptBase::initialize(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck) |
{ |
+ m_injectedScriptObject = injectedScriptObject; |
+ m_inspectedStateAccessCheck = accessCheck; |
} |
-void InjectedScriptBase::initialize(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck) |
+V8InjectedScriptBase::V8InjectedScriptBase(const String& name) |
+ : m_name(name) |
+ , m_inspectedStateAccessCheck(0) |
{ |
- m_injectedScriptObject = injectedScriptObject; |
- m_inspectedStateAccessCheck = accessCheck; |
} |
-bool InjectedScriptBase::canAccessInspectedWindow() const |
+V8InjectedScriptBase::V8InjectedScriptBase(const String& name, ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck) |
+ : m_name(name) |
+ , m_inspectedStateAccessCheck(accessCheck) |
+ , m_injectedScriptObject(injectedScriptObject) |
{ |
- return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState()); |
} |
-const ScriptObject& InjectedScriptBase::injectedScriptObject() const |
+const ScriptObject& V8InjectedScriptBase::injectedScriptObject() const |
{ |
return m_injectedScriptObject; |
} |
-ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const |
+ScriptValue V8InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall& function, bool& hadException) const |
{ |
ExecutionContext* executionContext = m_injectedScriptObject.scriptState()->executionContext(); |
TRACE_EVENT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "FunctionCall", "data", InspectorFunctionCallEvent::data(executionContext, 0, name(), 1)); |
@@ -99,7 +99,7 @@ ScriptValue InjectedScriptBase::callFunctionWithEvalEnabled(ScriptFunctionCall& |
return resultValue; |
} |
-void InjectedScriptBase::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue>* result) |
+void V8InjectedScriptBase::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue>* result) |
{ |
if (isEmpty() || !canAccessInspectedWindow()) { |
*result = JSONValue::null(); |
@@ -119,7 +119,7 @@ void InjectedScriptBase::makeCall(ScriptFunctionCall& function, RefPtr<JSONValue |
} |
} |
-void InjectedScriptBase::makeEvalCall(ErrorString* errorString, ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown) |
+void V8InjectedScriptBase::makeEvalCall(ErrorString* errorString, ScriptFunctionCall& function, RefPtr<TypeBuilder::Runtime::RemoteObject>* objectResult, TypeBuilder::OptOutput<bool>* wasThrown) |
{ |
RefPtr<JSONValue> result; |
makeCall(function, &result); |