Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1219)

Unified Diff: Source/core/inspector/InjectedScriptBase.cpp

Issue 293963003: Remove ScriptObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InjectedScriptBase.h ('k') | Source/core/inspector/InjectedScriptCanvasModule.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InjectedScriptBase.cpp
diff --git a/Source/core/inspector/InjectedScriptBase.cpp b/Source/core/inspector/InjectedScriptBase.cpp
index cf05edd354eb3fb97b18319ee1579c3c77183a3b..e3bbb3109d3952d3750cc8ecc56b475818c7c5fd 100644
--- a/Source/core/inspector/InjectedScriptBase.cpp
+++ b/Source/core/inspector/InjectedScriptBase.cpp
@@ -49,14 +49,14 @@ InjectedScriptBase::InjectedScriptBase(const String& name)
{
}
-InjectedScriptBase::InjectedScriptBase(const String& name, ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
+InjectedScriptBase::InjectedScriptBase(const String& name, ScriptValue injectedScriptObject, InspectedStateAccessCheck accessCheck)
: m_name(name)
, m_injectedScriptObject(injectedScriptObject)
, m_inspectedStateAccessCheck(accessCheck)
{
}
-void InjectedScriptBase::initialize(ScriptObject injectedScriptObject, InspectedStateAccessCheck accessCheck)
+void InjectedScriptBase::initialize(ScriptValue injectedScriptObject, InspectedStateAccessCheck accessCheck)
{
m_injectedScriptObject = injectedScriptObject;
m_inspectedStateAccessCheck = accessCheck;
@@ -67,7 +67,7 @@ bool InjectedScriptBase::canAccessInspectedWindow() const
return m_inspectedStateAccessCheck(m_injectedScriptObject.scriptState());
}
-const ScriptObject& InjectedScriptBase::injectedScriptObject() const
+const ScriptValue& InjectedScriptBase::injectedScriptObject() const
{
return m_injectedScriptObject;
}
« no previous file with comments | « Source/core/inspector/InjectedScriptBase.h ('k') | Source/core/inspector/InjectedScriptCanvasModule.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698