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

Side by Side Diff: Source/bindings/core/dart/DartScriptDebugServer.h

Issue 575883003: Fix more inspector compile errors from merge as well as a ScriptState compile error. (Closed) Base URL: svn://svn.chromium.org/blink/branches/dart/dartium
Patch Set: Created 6 years, 3 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/bindings/core/dart/DartScriptDebugServer.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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 182
183 virtual void setPauseOnNextStatement(bool); 183 virtual void setPauseOnNextStatement(bool);
184 virtual bool canBreakProgram(); 184 virtual bool canBreakProgram();
185 virtual void breakProgram(); 185 virtual void breakProgram();
186 virtual void continueProgram(); 186 virtual void continueProgram();
187 virtual void stepIntoStatement(); 187 virtual void stepIntoStatement();
188 virtual void stepOverStatement(); 188 virtual void stepOverStatement();
189 virtual void stepOutOfFunction(); 189 virtual void stepOutOfFunction();
190 190
191 virtual bool setScriptSource(const String& sourceID, const String& newConten t, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceErr or>&, StackTrace* newCallFrames, RefPtr<JSONObject>* result); 191 virtual bool setScriptSource(const String& sourceID, const String& newConten t, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceErr or>&, StackTrace* newCallFrames, RefPtr<JSONObject>* result);
192 virtual ScriptCallFrame callFrameNoScopes(int index);
193
192 virtual ScriptCallFrame topCallFrameNoScopes(); 194 virtual ScriptCallFrame topCallFrameNoScopes();
193 virtual int frameCount(); 195 virtual int frameCount();
194 virtual StackTrace currentCallFrames(); 196 virtual StackTrace currentCallFrames();
195 virtual StackTrace currentCallFramesForAsyncStack(); 197 virtual StackTrace currentCallFramesForAsyncStack();
196 198
197 virtual bool isPaused(); 199 virtual bool isPaused();
198 virtual bool runningNestedMessageLoop() { return m_runningNestedMessageLoop; } 200 virtual bool runningNestedMessageLoop() { return m_runningNestedMessageLoop; }
199 201
200 virtual void clearCompiledScripts(); 202 virtual void clearCompiledScripts();
201 virtual void setPreprocessorSource(const String&); 203 virtual void setPreprocessorSource(const String&);
(...skipping 27 matching lines...) Expand all
229 231
230 DartPageDebug* lookupPageDebugForId(const String& id); 232 DartPageDebug* lookupPageDebugForId(const String& id);
231 DartPageDebug* lookupPageDebug(Page*); 233 DartPageDebug* lookupPageDebug(Page*);
232 DartPageDebug* lookupPageDebugForCurrentIsolate(); 234 DartPageDebug* lookupPageDebugForCurrentIsolate();
233 void runMessageLoopOnPause(Dart_Isolate); 235 void runMessageLoopOnPause(Dart_Isolate);
234 void quitMessageLoopOnPause(); 236 void quitMessageLoopOnPause();
235 bool executeSkipPauseRequest(ScriptDebugListener::SkipPauseRequest, Dart_Sta ckTrace); 237 bool executeSkipPauseRequest(ScriptDebugListener::SkipPauseRequest, Dart_Sta ckTrace);
236 void handleProgramBreak(Dart_Isolate, Dart_StackTrace, intptr_t dartBreakpoi ntId, Dart_Handle exception, const Dart_CodeLocation&); 238 void handleProgramBreak(Dart_Isolate, Dart_StackTrace, intptr_t dartBreakpoi ntId, Dart_Handle exception, const Dart_CodeLocation&);
237 void handleDartDebugEvent(Dart_IsolateId, intptr_t breakpointId, Dart_Handle exception, const Dart_CodeLocation&); 239 void handleDartDebugEvent(Dart_IsolateId, intptr_t breakpointId, Dart_Handle exception, const Dart_CodeLocation&);
238 240
241 ScriptCallFrame getScriptCallFrameHelper(int frameIndex);
242
239 void debugBreak(); 243 void debugBreak();
240 void cancelDebugBreak(); 244 void cancelDebugBreak();
241 Page* inferPage(Dart_Isolate); 245 Page* inferPage(Dart_Isolate);
242 246
243 Vector<Dart_Isolate> isolates(); 247 Vector<Dart_Isolate> isolates();
244 Vector<DartPageDebug*> pages(); 248 Vector<DartPageDebug*> pages();
245 249
246 ScriptDebugServer::PauseOnExceptionsState m_pauseOnExceptionState; 250 ScriptDebugServer::PauseOnExceptionsState m_pauseOnExceptionState;
247 bool m_breakpointsActivated; 251 bool m_breakpointsActivated;
248 bool m_runningNestedMessageLoop; 252 bool m_runningNestedMessageLoop;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 286
283 virtual void setPauseOnNextStatement(bool); 287 virtual void setPauseOnNextStatement(bool);
284 virtual bool canBreakProgram(); 288 virtual bool canBreakProgram();
285 virtual void breakProgram(); 289 virtual void breakProgram();
286 virtual void continueProgram(); 290 virtual void continueProgram();
287 virtual void stepIntoStatement(); 291 virtual void stepIntoStatement();
288 virtual void stepOverStatement(); 292 virtual void stepOverStatement();
289 virtual void stepOutOfFunction(); 293 virtual void stepOutOfFunction();
290 294
291 virtual bool setScriptSource(const String& sourceID, const String& newConten t, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceErr or>&, StackTrace* newCallFrames, RefPtr<JSONObject>* result); 295 virtual bool setScriptSource(const String& sourceID, const String& newConten t, bool preview, String* error, RefPtr<TypeBuilder::Debugger::SetScriptSourceErr or>&, StackTrace* newCallFrames, RefPtr<JSONObject>* result);
296 virtual ScriptCallFrame callFrameNoScopes(int index);
292 297
293 virtual ScriptCallFrame topCallFrameNoScopes(); 298 virtual ScriptCallFrame topCallFrameNoScopes();
294 virtual int frameCount(); 299 virtual int frameCount();
295 virtual StackTrace currentCallFrames(); 300 virtual StackTrace currentCallFrames();
296 virtual StackTrace currentCallFramesForAsyncStack(); 301 virtual StackTrace currentCallFramesForAsyncStack();
297 302
298 virtual bool isPaused(); 303 virtual bool isPaused();
299 virtual bool runningNestedMessageLoop(); 304 virtual bool runningNestedMessageLoop();
300 305
301 virtual void clearCompiledScripts(); 306 virtual void clearCompiledScripts();
(...skipping 17 matching lines...) Expand all
319 324
320 bool isDartSourceID(const String& sourceID); 325 bool isDartSourceID(const String& sourceID);
321 bool isDartBreakpointId(const String& breakpointId); 326 bool isDartBreakpointId(const String& breakpointId);
322 DartScriptDebugServer* m_dart; 327 DartScriptDebugServer* m_dart;
323 PageScriptDebugServer* m_v8; 328 PageScriptDebugServer* m_v8;
324 }; 329 };
325 330
326 } 331 }
327 332
328 #endif // DartScriptDebugServer_h 333 #endif // DartScriptDebugServer_h
OLDNEW
« no previous file with comments | « no previous file | Source/bindings/core/dart/DartScriptDebugServer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698