Index: core/inspector/InspectorInstrumentation.idl |
diff --git a/core/inspector/InspectorInstrumentation.idl b/core/inspector/InspectorInstrumentation.idl |
index a9bd1ae80865dec7e156509d10240aa4162414c4..6aa4ee55c7c921ca79f9dc699e0ca1c8ef589b6c 100644 |
--- a/core/inspector/InspectorInstrumentation.idl |
+++ b/core/inspector/InspectorInstrumentation.idl |
@@ -336,10 +336,10 @@ interface InspectorInstrumentation { |
[Page] |
void frameStoppedLoading([Keep] Frame*); |
- [Page] |
+ [Page, Resource] |
void frameScheduledNavigation([Keep] Frame*, double delay); |
- [Page] |
+ [Page, Resource] |
void frameClearedScheduledNavigation([Keep] Frame*); |
[Page, Inline=FastReturn] |
@@ -381,6 +381,18 @@ interface InspectorInstrumentation { |
[Worker] |
void workerGlobalScopeTerminated(ScriptExecutionContext*, WorkerGlobalScopeProxy* proxy); |
+ [Profiler, Timeline] |
+ void willProcessTask(WorkerGlobalScope* context); |
+ |
+ [Profiler, Timeline] |
+ void didProcessTask(WorkerGlobalScope* context); |
+ |
+ [Profiler] |
+ void willEnterNestedRunLoop(WorkerGlobalScope* context); |
+ |
+ [Profiler] |
+ void didLeaveNestedRunLoop(WorkerGlobalScope* context); |
+ |
[Resource, Timeline] |
void didCreateWebSocket([Keep] Document*, unsigned long identifier, const KURL& requestURL, const String& protocol); |
@@ -418,39 +430,35 @@ interface InspectorConsoleInstrumentation { |
#include "core/inspector/ScriptCallStack.h" |
#include "core/inspector/ScriptProfile.h" |
- [Console, Debugger] // FIXME: Drop this once we no longer generate stacks outside of Inspector. |
- void addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier = 0); |
- |
- [Console, Debugger] |
- void addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, ScriptState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier = 0); |
- |
- [Console] |
- void addMessageToConsole(Page* page, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber = 0, ScriptState* state = 0, unsigned long requestIdentifier = 0); |
- |
// FIXME: Convert to ScriptArguments to match non-worker context. |
// Use the same implementation as above as a similar method dispatched on Page. |
- void addMessageToConsole(WorkerGlobalScope* workerGlobalScope, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier = 0); |
+ [Console] |
+ void addMessageToConsole(ScriptExecutionContext* context, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtr<ScriptCallStack> callStack, unsigned long requestIdentifier = 0); |
// Use the same implementation as above as a similar method dispatched on Page. |
- void addMessageToConsole(WorkerGlobalScope* workerGlobalScope, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier = 0); |
+ [Console] |
+ void addMessageToConsole(ScriptExecutionContext* context, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier = 0); |
+ |
+ [Console, Debugger] |
+ void addMessageToConsole(ScriptExecutionContext* context, MessageSource source, MessageType type, MessageLevel level, const String& message, ScriptState* state, PassRefPtr<ScriptArguments> arguments, unsigned long requestIdentifier = 0); |
[Console] |
- void consoleCount(Page* page, ScriptState* state, PassRefPtr<ScriptArguments> arguments); |
+ void consoleCount(ScriptExecutionContext* context, ScriptState* state, PassRefPtr<ScriptArguments> arguments); |
[Timeline, Console] |
- void startConsoleTiming([Keep] Frame* frame, const String& title); |
+ void startConsoleTiming([Keep] ScriptExecutionContext* context, const String& title); |
[Console, Timeline] |
- void stopConsoleTiming([Keep] Frame* frame, const String& title, PassRefPtr<ScriptCallStack> stack); |
+ void stopConsoleTiming([Keep] ScriptExecutionContext* context, const String& title, PassRefPtr<ScriptCallStack> stack); |
[Timeline, Inline=FastReturn] |
- void consoleTimeStamp([Keep] Frame* frame, PassRefPtr<ScriptArguments> arguments); |
+ void consoleTimeStamp([Keep] ScriptExecutionContext* context, PassRefPtr<ScriptArguments> arguments); |
[Profiler] |
- void addStartProfilingMessageToConsole(Page* page, const String& title, unsigned lineNumber, const String& sourceURL); |
+ void addStartProfilingMessageToConsole(ScriptExecutionContext* context, const String& title, unsigned lineNumber, const String& sourceURL); |
[Profiler] |
- void addProfile(Page* page, PassRefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack); |
+ void addProfile(ScriptExecutionContext* context, PassRefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack); |
} |
interface InspectorDatabaseInstrumentation { |
@@ -481,7 +489,7 @@ interface InspectorOverrides { |
DeviceOrientationData* overrideDeviceOrientation(Page* page, [DefaultReturn] DeviceOrientationData* deviceOrientation); |
[Profiler] |
- String getCurrentUserInitiatedProfileName(Page* page, bool incrementProfileNumber); |
+ String getCurrentUserInitiatedProfileName(ScriptExecutionContext* context, bool incrementProfileNumber); |
} |