summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/inspector/ScriptDebugServer.h
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@lorry>2016-05-24 08:28:08 +0000
committerLorry Tar Creator <lorry-tar-importer@lorry>2016-05-24 08:28:08 +0000
commita4e969f4965059196ca948db781e52f7cfebf19e (patch)
tree6ca352808c8fdc52006a0f33f6ae3c593b23867d /Source/JavaScriptCore/inspector/ScriptDebugServer.h
parent41386e9cb918eed93b3f13648cbef387e371e451 (diff)
downloadWebKitGtk-tarball-a4e969f4965059196ca948db781e52f7cfebf19e.tar.gz
webkitgtk-2.12.3webkitgtk-2.12.3
Diffstat (limited to 'Source/JavaScriptCore/inspector/ScriptDebugServer.h')
-rw-r--r--Source/JavaScriptCore/inspector/ScriptDebugServer.h53
1 files changed, 26 insertions, 27 deletions
diff --git a/Source/JavaScriptCore/inspector/ScriptDebugServer.h b/Source/JavaScriptCore/inspector/ScriptDebugServer.h
index 6d55de241..ea210d3d2 100644
--- a/Source/JavaScriptCore/inspector/ScriptDebugServer.h
+++ b/Source/JavaScriptCore/inspector/ScriptDebugServer.h
@@ -11,7 +11,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
@@ -36,14 +36,12 @@
#include "debugger/Debugger.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
-#include <wtf/RefPtr.h>
-#include <wtf/Vector.h>
-#include <wtf/text/TextPosition.h>
#include <wtf/text/WTFString.h>
namespace JSC {
class ExecState;
class JSGlobalObject;
+class VM;
}
namespace Inspector {
@@ -56,59 +54,60 @@ public:
void removeBreakpoint(JSC::BreakpointID);
void clearBreakpoints();
- virtual void recompileAllJSFunctions() = 0;
+ const BreakpointActions& getActionsForBreakpoint(JSC::BreakpointID);
- const Vector<ScriptBreakpointAction>& getActionsForBreakpoint(JSC::BreakpointID);
-
- class Task {
- WTF_MAKE_FAST_ALLOCATED;
- public:
- virtual ~Task() { }
- virtual void run() = 0;
- };
+ void addListener(ScriptDebugListener*);
+ void removeListener(ScriptDebugListener*, bool isBeingDestroyed);
protected:
typedef HashSet<ScriptDebugListener*> ListenerSet;
typedef void (ScriptDebugServer::*JavaScriptExecutionCallback)(ScriptDebugListener*);
- ScriptDebugServer(bool isInWorkerThread = false);
+ ScriptDebugServer(JSC::VM&);
~ScriptDebugServer();
- virtual ListenerSet* getListenersForGlobalObject(JSC::JSGlobalObject*) = 0;
+ virtual void attachDebugger() = 0;
+ virtual void detachDebugger(bool isBeingDestroyed) = 0;
+
virtual void didPause(JSC::JSGlobalObject*) = 0;
virtual void didContinue(JSC::JSGlobalObject*) = 0;
virtual void runEventLoopWhilePaused() = 0;
virtual bool isContentScript(JSC::ExecState*) const = 0;
- virtual void reportException(JSC::ExecState*, JSC::JSValue) const = 0;
+ virtual void reportException(JSC::ExecState*, JSC::Exception*) const = 0;
bool evaluateBreakpointAction(const ScriptBreakpointAction&);
- void dispatchFunctionToListeners(JavaScriptExecutionCallback, JSC::JSGlobalObject*);
+ void dispatchFunctionToListeners(JavaScriptExecutionCallback);
void dispatchFunctionToListeners(const ListenerSet& listeners, JavaScriptExecutionCallback);
void dispatchDidPause(ScriptDebugListener*);
void dispatchDidContinue(ScriptDebugListener*);
void dispatchDidParseSource(const ListenerSet& listeners, JSC::SourceProvider*, bool isContentScript);
void dispatchFailedToParseSource(const ListenerSet& listeners, JSC::SourceProvider*, int errorLine, const String& errorMessage);
void dispatchBreakpointActionLog(JSC::ExecState*, const String&);
- void dispatchBreakpointActionSound(JSC::ExecState*);
- void dispatchDidSampleProbe(JSC::ExecState*, int probeIdentifier, const Deprecated::ScriptValue& sample);
+ void dispatchBreakpointActionSound(JSC::ExecState*, int breakpointActionIdentifier);
+ void dispatchBreakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, const Deprecated::ScriptValue& sample);
- bool m_doneProcessingDebuggerEvents;
+ bool m_doneProcessingDebuggerEvents {true};
private:
- typedef Vector<ScriptBreakpointAction> BreakpointActions;
typedef HashMap<JSC::BreakpointID, BreakpointActions> BreakpointIDToActionsMap;
virtual void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const String& errorMsg) override final;
- virtual bool needPauseHandling(JSC::JSGlobalObject*) override final;
- virtual void handleBreakpointHit(const JSC::Breakpoint&) override final;
- virtual void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::JSValue exception) const override final;
- virtual void handlePause(JSC::Debugger::ReasonForPause, JSC::JSGlobalObject*) override final;
+ virtual bool needPauseHandling(JSC::JSGlobalObject*) override final { return true; }
+ virtual void handleBreakpointHit(JSC::JSGlobalObject*, const JSC::Breakpoint&) override final;
+ virtual void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::Exception*) const override final;
+ virtual void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) override final;
virtual void notifyDoneProcessingDebuggerEvents() override final;
- unsigned m_hitCount;
- bool m_callingListeners;
+ Deprecated::ScriptValue exceptionOrCaughtValue(JSC::ExecState*);
+
BreakpointIDToActionsMap m_breakpointIDToActions;
+
+ ListenerSet m_listeners;
+ bool m_callingListeners {false};
+
+ unsigned m_nextProbeSampleId {1};
+ unsigned m_currentProbeBatchId {0};
};
} // namespace Inspector