#ifndef InspectorDebuggerAgent_h
#define InspectorDebuggerAgent_h
-#include "InspectorFrontend.h"
-#include "bindings/v8/ScriptState.h"
+#include "bindings/core/v8/ScriptState.h"
+#include "core/InspectorFrontend.h"
#include "core/frame/ConsoleTypes.h"
#include "core/inspector/AsyncCallStackTracker.h"
#include "core/inspector/ConsoleAPITypes.h"
#include "wtf/Vector.h"
#include "wtf/text/StringHash.h"
-namespace WebCore {
+namespace blink {
+class ConsoleMessage;
class Document;
+class Event;
class EventListener;
class EventTarget;
class ExecutionContextTask;
class HTTPHeaderMap;
class InjectedScriptManager;
class InspectorFrontend;
-class InstrumentingAgents;
+class JavaScriptCallFrame;
class JSONObject;
class KURL;
class MutationObserver;
-class ScriptArguments;
-class ScriptCallStack;
+class ScriptAsyncCallStack;
class ScriptDebugServer;
class ScriptRegexp;
class ScriptSourceCode;
typedef String ErrorString;
class InspectorDebuggerAgent : public InspectorBaseAgent<InspectorDebuggerAgent>, public ScriptDebugListener, public InspectorBackendDispatcher::DebuggerCommandHandler {
- WTF_MAKE_NONCOPYABLE(InspectorDebuggerAgent); WTF_MAKE_FAST_ALLOCATED;
+ WTF_MAKE_NONCOPYABLE(InspectorDebuggerAgent);
+ WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
public:
enum BreakpointSource {
UserBreakpointSource,
static const char backtraceObjectGroup[];
virtual ~InspectorDebuggerAgent();
+ virtual void trace(Visitor*);
- virtual void canSetScriptSource(ErrorString*, bool* result) OVERRIDE FINAL { *result = true; }
+ virtual void canSetScriptSource(ErrorString*, bool* result) override final { *result = true; }
- virtual void init() OVERRIDE FINAL;
- virtual void setFrontend(InspectorFrontend*) OVERRIDE FINAL;
- virtual void clearFrontend() OVERRIDE FINAL;
- virtual void restore() OVERRIDE FINAL;
+ virtual void init() override final;
+ virtual void setFrontend(InspectorFrontend*) override final;
+ virtual void clearFrontend() override final;
+ virtual void restore() override final;
bool isPaused();
bool runningNestedMessageLoop();
- void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String&, ScriptCallStack*, unsigned long);
- void addMessageToConsole(MessageSource, MessageType, MessageLevel, const String&, ScriptState*, ScriptArguments*, unsigned long);
+ void addMessageToConsole(ConsoleMessage*);
String preprocessEventListener(LocalFrame*, const String& source, const String& url, const String& functionName);
PassOwnPtr<ScriptSourceCode> preprocess(LocalFrame*, const ScriptSourceCode&);
// Part of the protocol.
- virtual void enable(ErrorString*) OVERRIDE FINAL;
- virtual void disable(ErrorString*) OVERRIDE FINAL;
- virtual void setBreakpointsActive(ErrorString*, bool active) OVERRIDE FINAL;
- virtual void setSkipAllPauses(ErrorString*, bool skipped, const bool* untilReload) OVERRIDE FINAL;
-
- virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const String* optionalCondition, const bool* isAntiBreakpoint, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> >& locations) OVERRIDE FINAL;
- virtual void setBreakpoint(ErrorString*, const RefPtr<JSONObject>& location, const String* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Debugger::Location>& actualLocation) OVERRIDE FINAL;
- virtual void removeBreakpoint(ErrorString*, const String& breakpointId) OVERRIDE FINAL;
- virtual void continueToLocation(ErrorString*, const RefPtr<JSONObject>& location, const bool* interstateLocationOpt) OVERRIDE FINAL;
- virtual void getStepInPositions(ErrorString*, const String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> >& positions) OVERRIDE FINAL;
- virtual void getBacktrace(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >&, RefPtr<TypeBuilder::Debugger::StackTrace>&) OVERRIDE FINAL;
-
- virtual void searchInContent(ErrorString*, const String& scriptId, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> >&) OVERRIDE FINAL;
- virtual void setScriptSource(ErrorString*, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, const String& scriptId, const String& newContent, const bool* preview, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) OVERRIDE FINAL;
- virtual void restartFrame(ErrorString*, const String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) OVERRIDE FINAL;
- virtual void getScriptSource(ErrorString*, const String& scriptId, String* scriptSource) OVERRIDE FINAL;
- virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>&) OVERRIDE FINAL;
- virtual void pause(ErrorString*) OVERRIDE FINAL;
- virtual void resume(ErrorString*) OVERRIDE FINAL;
- virtual void stepOver(ErrorString*, const String* callFrameId) OVERRIDE FINAL;
- virtual void stepInto(ErrorString*) OVERRIDE FINAL;
- virtual void stepOut(ErrorString*, const String* callFrameId) OVERRIDE FINAL;
- virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) OVERRIDE FINAL;
+ virtual void enable(ErrorString*) override final;
+ virtual void disable(ErrorString*) override final;
+ virtual void setBreakpointsActive(ErrorString*, bool active) override final;
+ virtual void setSkipAllPauses(ErrorString*, bool skipped, const bool* untilReload) override final;
+
+ virtual void setBreakpointByUrl(ErrorString*, int lineNumber, const String* optionalURL, const String* optionalURLRegex, const int* optionalColumnNumber, const String* optionalCondition, const bool* isAntiBreakpoint, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> >& locations) override final;
+ virtual void setBreakpoint(ErrorString*, const RefPtr<JSONObject>& location, const String* optionalCondition, TypeBuilder::Debugger::BreakpointId*, RefPtr<TypeBuilder::Debugger::Location>& actualLocation) override final;
+ virtual void removeBreakpoint(ErrorString*, const String& breakpointId) override final;
+ virtual void continueToLocation(ErrorString*, const RefPtr<JSONObject>& location, const bool* interstateLocationOpt) override final;
+ virtual void getStepInPositions(ErrorString*, const String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::Location> >& positions) override final;
+ virtual void getBacktrace(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >&, RefPtr<TypeBuilder::Debugger::StackTrace>&) override final;
+ virtual void searchInContent(ErrorString*, const String& scriptId, const String& query, const bool* optionalCaseSensitive, const bool* optionalIsRegex, RefPtr<TypeBuilder::Array<TypeBuilder::Page::SearchMatch> >&) override final;
+ virtual void setScriptSource(ErrorString*, RefPtr<TypeBuilder::Debugger::SetScriptSourceError>&, const String& scriptId, const String& newContent, const bool* preview, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) override final;
+ virtual void restartFrame(ErrorString*, const String& callFrameId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> >& newCallFrames, RefPtr<JSONObject>& result, RefPtr<TypeBuilder::Debugger::StackTrace>& asyncStackTrace) override final;
+ virtual void getScriptSource(ErrorString*, const String& scriptId, String* scriptSource) override final;
+ virtual void getFunctionDetails(ErrorString*, const String& functionId, RefPtr<TypeBuilder::Debugger::FunctionDetails>&) override final;
+ virtual void getCollectionEntries(ErrorString*, const String& objectId, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CollectionEntry> >&) override final;
+ virtual void pause(ErrorString*) override final;
+ virtual void resume(ErrorString*) override final;
+ virtual void stepOver(ErrorString*) override final;
+ virtual void stepInto(ErrorString*) override final;
+ virtual void stepOut(ErrorString*) override final;
+ virtual void setPauseOnExceptions(ErrorString*, const String& pauseState) override final;
virtual void evaluateOnCallFrame(ErrorString*,
const String& callFrameId,
const String& expression,
const bool* returnByValue,
const bool* generatePreview,
RefPtr<TypeBuilder::Runtime::RemoteObject>& result,
- TypeBuilder::OptOutput<bool>* wasThrown) OVERRIDE FINAL;
- virtual void compileScript(ErrorString*, const String& expression, const String& sourceURL, TypeBuilder::OptOutput<TypeBuilder::Debugger::ScriptId>*, TypeBuilder::OptOutput<String>* syntaxErrorMessage) OVERRIDE;
- virtual void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const int* executionContextId, const String* objectGroup, const bool* doNotPauseOnExceptionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, TypeBuilder::OptOutput<bool>* wasThrown) OVERRIDE;
- virtual void setOverlayMessage(ErrorString*, const String*) OVERRIDE;
- virtual void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_variableName, const RefPtr<JSONObject>& in_newValue, const String* in_callFrame, const String* in_functionObjectId) OVERRIDE FINAL;
- virtual void skipStackFrames(ErrorString*, const String* pattern) OVERRIDE FINAL;
- virtual void setAsyncCallStackDepth(ErrorString*, int depth) OVERRIDE FINAL;
+ TypeBuilder::OptOutput<bool>* wasThrown,
+ RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) override final;
+ virtual void compileScript(ErrorString*, const String& expression, const String& sourceURL, const int* executionContextId, TypeBuilder::OptOutput<TypeBuilder::Debugger::ScriptId>*, RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) override;
+ virtual void runScript(ErrorString*, const TypeBuilder::Debugger::ScriptId&, const int* executionContextId, const String* objectGroup, const bool* doNotPauseOnExceptionsAndMuteConsole, RefPtr<TypeBuilder::Runtime::RemoteObject>& result, RefPtr<TypeBuilder::Debugger::ExceptionDetails>&) override;
+ virtual void setOverlayMessage(ErrorString*, const String*) override;
+ virtual void setVariableValue(ErrorString*, int in_scopeNumber, const String& in_variableName, const RefPtr<JSONObject>& in_newValue, const String* in_callFrame, const String* in_functionObjectId) override final;
+ virtual void skipStackFrames(ErrorString*, const String* pattern, const bool* skipContentScripts) override final;
+ virtual void setAsyncCallStackDepth(ErrorString*, int depth) override final;
+ virtual void enablePromiseTracker(ErrorString*) override final;
+ virtual void disablePromiseTracker(ErrorString*) override final;
+ virtual void getPromises(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Debugger::PromiseDetails> >& promises) override final;
+ virtual void getPromiseById(ErrorString*, int promiseId, const String* objectGroup, RefPtr<TypeBuilder::Runtime::RemoteObject>& promise) override final;
void schedulePauseOnNextStatement(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
void didInstallTimer(ExecutionContext*, int timerId, int timeout, bool singleShot);
void didCancelAnimationFrame(Document*, int callbackId);
bool willFireAnimationFrame(Document*, int callbackId);
void didFireAnimationFrame();
- void didAddEventListener(EventTarget*, const AtomicString& eventType, EventListener*, bool useCapture);
- void didRemoveEventListener(EventTarget*, const AtomicString& eventType, EventListener*, bool useCapture);
- void didRemoveAllEventListeners(EventTarget*);
- void willHandleEvent(EventTarget*, const AtomicString& eventType, EventListener*, bool useCapture);
+ void didEnqueueEvent(EventTarget*, Event*);
+ void didRemoveEvent(EventTarget*, Event*);
+ void willHandleEvent(EventTarget*, Event*, EventListener*, bool useCapture);
void didHandleEvent();
- void willLoadXHR(XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString& method, const KURL&, bool async, FormData* body, const HTTPHeaderMap& headers, bool includeCrendentials);
+ void willLoadXHR(XMLHttpRequest*, ThreadableLoaderClient*, const AtomicString& method, const KURL&, bool async, PassRefPtr<FormData> body, const HTTPHeaderMap& headers, bool includeCrendentials);
+ void didDispatchXHRLoadendEvent(XMLHttpRequest*);
void didEnqueueMutationRecord(ExecutionContext*, MutationObserver*);
void didClearAllMutationRecords(ExecutionContext*, MutationObserver*);
void willDeliverMutationRecords(ExecutionContext*, MutationObserver*);
void didDeliverMutationRecords();
- void didPostPromiseTask(ExecutionContext*, ExecutionContextTask*, bool isResolved);
- void willPerformPromiseTask(ExecutionContext*, ExecutionContextTask*);
- void didPerformPromiseTask();
- bool isPromiseTrackerEnabled();
- void didCreatePromise(const ScriptObject& promise);
- void didUpdatePromiseParent(const ScriptObject& promise, const ScriptObject& parentPromise);
- void didUpdatePromiseState(const ScriptObject& promise, V8PromiseCustom::PromiseState, const ScriptValue& result);
+ void didPostExecutionContextTask(ExecutionContext*, ExecutionContextTask*);
+ void didKillAllExecutionContextTasks(ExecutionContext*);
+ void willPerformExecutionContextTask(ExecutionContext*, ExecutionContextTask*);
+ void didPerformExecutionContextTask();
+ int traceAsyncOperationStarting(ExecutionContext*, const String& operationName, int prevOperationId = 0);
+ void traceAsyncOperationCompleted(ExecutionContext*, int operationId);
+ void traceAsyncOperationCompletedCallbackStarting(ExecutionContext*, int operationId);
+ void traceAsyncCallbackStarting(ExecutionContext*, int operationId);
+ void traceAsyncCallbackCompleted();
bool canBreakProgram();
void breakProgram(InspectorFrontend::Debugger::Reason::Enum breakReason, PassRefPtr<JSONObject> data);
void scriptExecutionBlockedByCSP(const String& directiveText);
- class Listener {
+ class Listener : public WillBeGarbageCollectedMixin {
public:
virtual ~Listener() { }
virtual void debuggerWasEnabled() = 0;
virtual void debuggerWasDisabled() = 0;
virtual void stepInto() = 0;
virtual void didPause() = 0;
+ virtual bool canPauseOnPromiseEvent() = 0;
+ virtual void didCreatePromise() = 0;
+ virtual void didResolvePromise() = 0;
+ virtual void didRejectPromise() = 0;
};
void setListener(Listener* listener) { m_listener = listener; }
+ bool enabled();
+
virtual ScriptDebugServer& scriptDebugServer() = 0;
void setBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource, const String& condition = String());
void removeBreakpoint(const String& scriptId, int lineNumber, int columnNumber, BreakpointSource);
- virtual SkipPauseRequest shouldSkipExceptionPause(RefPtr<JavaScriptCallFrame>& topFrame) OVERRIDE FINAL;
- virtual SkipPauseRequest shouldSkipBreakpointPause(RefPtr<JavaScriptCallFrame>& topFrame) OVERRIDE FINAL;
- virtual SkipPauseRequest shouldSkipStepPause(RefPtr<JavaScriptCallFrame>& topFrame) OVERRIDE FINAL;
+ PassRefPtrWillBeRawPtr<ScriptAsyncCallStack> currentAsyncStackTraceForConsole();
protected:
explicit InspectorDebuggerAgent(InjectedScriptManager*);
virtual void enable();
virtual void disable();
- virtual void didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints) OVERRIDE FINAL;
- virtual void didContinue() OVERRIDE FINAL;
+ virtual SkipPauseRequest didPause(ScriptState*, const ScriptValue& callFrames, const ScriptValue& exception, const Vector<String>& hitBreakpoints, bool isPromiseRejection) override final;
+ virtual void didContinue() override final;
void reset();
void pageDidCommitLoad();
private:
+ SkipPauseRequest shouldSkipExceptionPause();
+ SkipPauseRequest shouldSkipStepPause();
+ bool isTopCallFrameInFramework();
+
void cancelPauseOnNextStatement();
void addMessageToConsole(MessageSource, MessageType);
- bool enabled();
-
PassRefPtr<TypeBuilder::Array<TypeBuilder::Debugger::CallFrame> > currentCallFrames();
PassRefPtr<TypeBuilder::Debugger::StackTrace> currentAsyncStackTrace();
- virtual void didParseSource(const String& scriptId, const Script&) OVERRIDE FINAL;
- virtual void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) OVERRIDE FINAL;
+ virtual void didParseSource(const String& scriptId, const Script&, CompileResult) override final;
+ virtual bool v8AsyncTaskEventsEnabled() const override final;
+ virtual void didReceiveV8AsyncTaskEvent(ExecutionContext*, const String& eventType, const String& eventName, int id) override final;
+ virtual bool v8PromiseEventsEnabled() const override final;
+ virtual void didReceiveV8PromiseEvent(ScriptState*, v8::Handle<v8::Object> promise, v8::Handle<v8::Value> parentPromise, int status) override final;
void setPauseOnExceptionsImpl(ErrorString*, int);
bool assertPaused(ErrorString*);
void clearBreakDetails();
- String sourceMapURLForScript(const Script&);
-
- String scriptURL(JavaScriptCallFrame*);
+ String sourceMapURLForScript(const Script&, CompileResult);
- ScriptValue resolveCallFrame(ErrorString*, const String* callFrameId);
+ PassRefPtrWillBeRawPtr<JavaScriptCallFrame> topCallFrameSkipUnknownSources(String* scriptURL, bool* isBlackboxed);
+ AsyncCallStackTracker& asyncCallStackTracker() const { return *m_asyncCallStackTracker; };
+ PromiseTracker& promiseTracker() const { return *m_promiseTracker; }
typedef HashMap<String, Script> ScriptsMap;
typedef HashMap<String, Vector<String> > BreakpointIdToDebugServerBreakpointIdsMap;
typedef HashMap<String, std::pair<String, BreakpointSource> > DebugServerBreakpointToBreakpointIdAndSourceMap;
- InjectedScriptManager* m_injectedScriptManager;
+ RawPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;
InspectorFrontend::Debugger* m_frontend;
- ScriptState* m_pausedScriptState;
+ RefPtr<ScriptState> m_pausedScriptState;
ScriptValue m_currentCallStack;
ScriptsMap m_scripts;
BreakpointIdToDebugServerBreakpointIdsMap m_breakpointIdToDebugServerBreakpointIds;
InspectorFrontend::Debugger::Reason::Enum m_breakReason;
RefPtr<JSONObject> m_breakAuxData;
bool m_javaScriptPauseScheduled;
- Listener* m_listener;
+ bool m_debuggerStepScheduled;
+ bool m_steppingFromFramework;
+ bool m_pausingOnNativeEvent;
+ RawPtrWillBeMember<Listener> m_listener;
- int m_skipStepInCount;
+ int m_skippedStepInCount;
+ int m_minFrameCountForSkip;
bool m_skipAllPauses;
+ bool m_skipContentScripts;
OwnPtr<ScriptRegexp> m_cachedSkipStackRegExp;
- AsyncCallStackTracker m_asyncCallStackTracker;
- PromiseTracker m_promiseTracker;
+ OwnPtrWillBeMember<AsyncCallStackTracker> m_asyncCallStackTracker;
+ OwnPtrWillBeMember<PromiseTracker> m_promiseTracker;
};
-} // namespace WebCore
+} // namespace blink
#endif // !defined(InspectorDebuggerAgent_h)
projects / platform / framework / web / crosswalk.git / blobdiff