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

Side by Side Diff: Source/core/inspector/InjectedScript.h

Issue 1689873002: Enable inspector tests disabled when dart:html was switched to JS interop. (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/2454_1
Patch Set: Created 4 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 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
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapObject(const ScriptValue& , const String& groupName, bool generatePreview = false) const; 109 PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapObject(const ScriptValue& , const String& groupName, bool generatePreview = false) const;
110 PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapTable(const ScriptValue& table, const ScriptValue& columns) const; 110 PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapTable(const ScriptValue& table, const ScriptValue& columns) const;
111 PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapNode(Node*, const String& groupName); 111 PassRefPtr<TypeBuilder::Runtime::RemoteObject> wrapNode(Node*, const String& groupName);
112 ScriptValue findObjectById(const String& objectId) const; 112 ScriptValue findObjectById(const String& objectId) const;
113 113
114 String objectIdToObjectGroupName(const String& objectId) const; 114 String objectIdToObjectGroupName(const String& objectId) const;
115 void releaseObjectGroup(const String&); 115 void releaseObjectGroup(const String&);
116 116
117 void setCustomObjectFormatterEnabled(bool); 117 void setCustomObjectFormatterEnabled(bool);
118 118
119 // Added for Dart.
120 ScriptValue injectedScriptObject() { return m_injectedScriptObject; }
121 // End of block added for Dart.
122
119 private: 123 private:
120 friend InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState*) ; 124 friend InjectedScript InjectedScriptManager::injectedScriptFor(ScriptState*) ;
121 using InspectedStateAccessCheck = bool (*)(ScriptState*); 125 using InspectedStateAccessCheck = bool (*)(ScriptState*);
122 InjectedScript(ScriptValue, InspectedStateAccessCheck, PassRefPtr<InjectedSc riptNative>); 126 InjectedScript(ScriptValue, InspectedStateAccessCheck, PassRefPtr<InjectedSc riptNative>);
123 127
124 ScriptValue nodeAsScriptValue(Node*); 128 ScriptValue nodeAsScriptValue(Node*);
125 void initialize(ScriptValue, InspectedStateAccessCheck); 129 void initialize(ScriptValue, InspectedStateAccessCheck);
126 bool canAccessInspectedWindow() const; 130 bool canAccessInspectedWindow() const;
127 const ScriptValue& injectedScriptObject() const; 131 const ScriptValue& injectedScriptObject() const;
128 ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadExcept ion) const; 132 ScriptValue callFunctionWithEvalEnabled(ScriptFunctionCall&, bool& hadExcept ion) const;
129 void makeCall(ScriptFunctionCall&, RefPtr<JSONValue>* result); 133 void makeCall(ScriptFunctionCall&, RefPtr<JSONValue>* result);
130 void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<TypeBuilder::Run time::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<Typ eBuilder::Debugger::ExceptionDetails>* = 0); 134 void makeEvalCall(ErrorString*, ScriptFunctionCall&, RefPtr<TypeBuilder::Run time::RemoteObject>* result, TypeBuilder::OptOutput<bool>* wasThrown, RefPtr<Typ eBuilder::Debugger::ExceptionDetails>* = 0);
131 void makeCallWithExceptionDetails(ScriptFunctionCall&, RefPtr<JSONValue>* re sult, RefPtr<TypeBuilder::Debugger::ExceptionDetails>*); 135 void makeCallWithExceptionDetails(ScriptFunctionCall&, RefPtr<JSONValue>* re sult, RefPtr<TypeBuilder::Debugger::ExceptionDetails>*);
132 136
133 ScriptValue m_injectedScriptObject; 137 ScriptValue m_injectedScriptObject;
134 InspectedStateAccessCheck m_inspectedStateAccessCheck; 138 InspectedStateAccessCheck m_inspectedStateAccessCheck;
135 RefPtr<InjectedScriptNative> m_native; 139 RefPtr<InjectedScriptNative> m_native;
136 }; 140 };
137 141
138 } // namespace blink 142 } // namespace blink
139 143
140 #endif 144 #endif
OLDNEW
« no previous file with comments | « Source/bindings/core/dart/DartInjectedScript.cpp ('k') | Source/core/inspector/InjectedScript.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698