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

Unified Diff: third_party/WebKit/Source/core/inspector/InjectedScript.h

Issue 1638563002: DevTools: migrate ScriptFunctionCall off ScriptValue (to be inlined into the InjectedScript.cpp). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ready for review Created 4 years, 11 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
Index: third_party/WebKit/Source/core/inspector/InjectedScript.h
diff --git a/third_party/WebKit/Source/core/inspector/InjectedScript.h b/third_party/WebKit/Source/core/inspector/InjectedScript.h
index 62218e22bae53513953a42f3eeab9338bcd0cdb9..1e29caf42c7fe077627a618eb6b990b3acd9b646 100644
--- a/third_party/WebKit/Source/core/inspector/InjectedScript.h
+++ b/third_party/WebKit/Source/core/inspector/InjectedScript.h
@@ -46,12 +46,10 @@ class RemoteObjectId;
class ScriptFunctionCall;
typedef String ErrorString;
-PassRefPtr<JSONValue> toJSONValue(const ScriptValue&);
class InjectedScript final {
USING_FAST_MALLOC(InjectedScript);
public:
- InjectedScript();
~InjectedScript();
ScriptState* scriptState() const
@@ -118,14 +116,15 @@ private:
using InspectedStateAccessCheck = bool (*)(ScriptState*);
InjectedScript(ScriptValue, InspectedStateAccessCheck, PassRefPtr<InjectedScriptNative>, int contextId);
- void initialize(ScriptValue, InspectedStateAccessCheck);
bool canAccessInspectedWindow() const;
- const ScriptValue& injectedScriptObject() const;
- ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const;
+ v8::Local<v8::Context> v8Context() const;
+ v8::Local<v8::Value> v8Value() const;
+ v8::Local<v8::Value> callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadException) const;
void makeCall(ScriptFunctionCall&, RefPtr<JSONValue>* result);
void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<TypeBuilder::Runtime::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<TypeBuilder::Debugger::ExceptionDetails>* = 0);
void makeCallWithExceptionDetails(ScriptFunctionCall&, RefPtr<JSONValue>* result, RefPtr<TypeBuilder::Debugger::ExceptionDetails>*);
+ v8::Isolate* m_isolate;
ScriptValue m_injectedScriptObject;
InspectedStateAccessCheck m_inspectedStateAccessCheck;
RefPtr<InjectedScriptNative> m_native;

Powered by Google App Engine
This is Rietveld 408576698