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

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

Issue 1669913003: Fix bug where Dart execution contexts were getting the wrong execution context id. (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
« no previous file with comments | « no previous file | Source/core/inspector/PageRuntimeAgent.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void isRunRequired(ErrorString*, bool* out_result) override; 97 void isRunRequired(ErrorString*, bool* out_result) override;
98 void setCustomObjectFormatterEnabled(ErrorString*, bool) final; 98 void setCustomObjectFormatterEnabled(ErrorString*, bool) final;
99 99
100 100
101 // Start Dart specific supplemental API 101 // Start Dart specific supplemental API
102 void getProperty(ErrorString*, const String& objectId, const RefPtr<JSONArra y>& propertyPath, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilde r::OptOutput<bool>* wasThrown) final; 102 void getProperty(ErrorString*, const String& objectId, const RefPtr<JSONArra y>& propertyPath, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilde r::OptOutput<bool>* wasThrown) final;
103 void getCompletions(ErrorString*, 103 void getCompletions(ErrorString*,
104 const String& expression, 104 const String& expression,
105 const int* executionContextId, 105 const int* executionContextId,
106 RefPtr<TypeBuilder::Array<String> >& result) final; 106 RefPtr<TypeBuilder::Array<String> >& result) final;
107 OwnPtr<DartInspectorRuntimeAgent> m_dart;
107 // End Dart specific Api 108 // End Dart specific Api
108 109
109 110
110 protected: 111 protected:
111 InspectorRuntimeAgent(InjectedScriptManager*, V8Debugger*, Client*); 112 InspectorRuntimeAgent(InjectedScriptManager*, V8Debugger*, Client*);
112 virtual InjectedScript injectedScriptForEval(ErrorString*, const int* execut ionContextId) = 0; 113 virtual InjectedScript injectedScriptForEval(ErrorString*, const int* execut ionContextId) = 0;
113 114
114 virtual void muteConsole() = 0; 115 virtual void muteConsole() = 0;
115 virtual void unmuteConsole() = 0; 116 virtual void unmuteConsole() = 0;
116 117
117 InjectedScriptManager* injectedScriptManager() { return m_injectedScriptMana ger; } 118 InjectedScriptManager* injectedScriptManager() { return m_injectedScriptMana ger; }
118 void addExecutionContextToFrontend(int executionContextId, const String& typ e, const String& origin, const String& humanReadableName, const String& frameId) ; 119 void addExecutionContextToFrontend(int executionContextId, const String& typ e, const String& origin, const String& humanReadableName, const String& frameId) ;
119 120
120 // Start Dart specific methods 121 // Start Dart specific methods
121 void addExecutionContextToFrontendDart(int executionContextId, const String& type, const String& origin, const String& humanReadableName, const String& fram eId, const char* language, intptr_t libraryId); 122 void addExecutionContextToFrontendDart(int executionContextId, const String& type, const String& origin, const String& humanReadableName, const String& fram eId, const char* language, intptr_t libraryId);
122 // End Dart specific methods 123 // End Dart specific methods
123 124
124 bool m_enabled; 125 bool m_enabled;
125 126
126 private: 127 private:
127 class InjectedScriptCallScope; 128 class InjectedScriptCallScope;
128 129
129 RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager; 130 RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
130 V8Debugger* m_debugger; 131 V8Debugger* m_debugger;
131 Client* m_client; 132 Client* m_client;
132
133 // Start Dart block.
134 OwnPtr<DartInspectorRuntimeAgent> m_dart;
135 // End Dart block.
136 }; 133 };
137 134
138 } // namespace blink 135 } // namespace blink
139 136
140 #endif // InspectorRuntimeAgent_h 137 #endif // InspectorRuntimeAgent_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/inspector/PageRuntimeAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698