Index: core/inspector/InspectorInstrumentation.idl |
diff --git a/core/inspector/InspectorInstrumentation.idl b/core/inspector/InspectorInstrumentation.idl |
index d8d4ec1b78456cf4935d0aef59c1824e6074a17f..d1d5b3be04bad18b0ca663c9f2cd43adf1a8c1ab 100644 |
--- a/core/inspector/InspectorInstrumentation.idl |
+++ b/core/inspector/InspectorInstrumentation.idl |
@@ -71,6 +71,9 @@ interface InspectorInstrumentation { |
void didClearDocumentOfWindowObject([Keep] LocalFrame*); |
[DOMDebugger, Inline=FastReturn] |
+ void willCloseWindow(ExecutionContext*); |
+ |
+ [DOMDebugger, Inline=FastReturn] |
void willInsertDOMNode([Keep] Node* parent); |
[DOM, DOMDebugger, Inline=FastReturn] |
@@ -190,6 +193,18 @@ interface InspectorInstrumentation { |
[Debugger, Inline=FastReturn] |
void didDeliverMutationRecords(ExecutionContext*); |
+ [Debugger, Inline=FastReturn] |
+ void didPostExecutionContextTask([Keep] ExecutionContext*, ExecutionContextTask*); |
+ |
+ [Debugger, Inline=FastReturn] |
+ void didKillAllExecutionContextTasks([Keep] ExecutionContext*); |
+ |
+ [Debugger, Inline=FastReturn] |
+ void willPerformExecutionContextTask([Keep] ExecutionContext*, ExecutionContextTask*); |
+ |
+ [Debugger, Inline=FastReturn] |
+ void didPerformExecutionContextTask(ExecutionContext*); |
+ |
[Timeline, Inline=FastReturn] |
InspectorInstrumentationCookie willEvaluateScript([Keep] LocalFrame*, const String& url, int lineNumber); |
@@ -226,6 +241,9 @@ interface InspectorInstrumentation { |
[Timeline, Inline=FastReturn] |
void didDispatchXHRLoadEvent(const InspectorInstrumentationCookie&); |
+ [Debugger, Inline=FastReturn] |
+ void didDispatchXHRLoadendEvent(ExecutionContext*, XMLHttpRequest*); |
+ |
[Timeline, Inline=FastReturn] |
void willScrollLayer([Keep] RenderObject*); |
@@ -275,9 +293,6 @@ interface InspectorInstrumentation { |
void continueAfterXFrameOptionsDenied(LocalFrame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r); |
[Inline=Forward] |
- void continueWithPolicyDownload(LocalFrame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r); |
- |
- [Inline=Forward] |
void continueWithPolicyIgnore(LocalFrame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r); |
[Timeline, Resource, Inline=FastReturn] |
@@ -439,24 +454,38 @@ interface InspectorInstrumentation { |
[DOMDebugger, Inline=FastReturn] |
void willExecuteCustomElementCallback([Keep] Element*); |
+ |
+ [Debugger, Inline=FastReturn] |
+ int traceAsyncOperationStarting([Keep] ExecutionContext*, const String& operationName); |
+ |
+ [Debugger, Inline=FastReturn] |
+ int traceAsyncOperationStarting([Keep] ExecutionContext*, const String& operationName, int prevOperationId); |
+ |
+ [Debugger, Inline=FastReturn] |
+ void traceAsyncOperationCompleted([Keep] ExecutionContext*, int operationId); |
+ |
+ [Debugger, Inline=FastReturn] |
+ InspectorInstrumentationCookie traceAsyncOperationCompletedCallbackStarting([Keep] ExecutionContext*, int operationId); |
+ |
+ [Debugger, Inline=FastReturn] |
+ InspectorInstrumentationCookie traceAsyncCallbackStarting([Keep] ExecutionContext*, int operationId); |
+ |
+ [Debugger, Inline=FastReturn] |
+ void traceAsyncCallbackCompleted(const InspectorInstrumentationCookie&); |
} |
interface InspectorConsoleInstrumentation { |
#include "core/inspector/ScriptArguments.h" |
-#include "core/inspector/ScriptCallStack.h" |
- // FIXME: Convert to ScriptArguments to match non-worker context. |
- // Use the same implementation as above as a similar method dispatched on Page. |
- [Console] |
- void addMessageToConsole(ExecutionContext* context, MessageSource source, MessageType type, MessageLevel level, const String& message, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, unsigned long requestIdentifier = 0); |
+class ConsoleMessage; |
// Use the same implementation as above as a similar method dispatched on Page. |
[Console] |
- void addMessageToConsole(ExecutionContext* context, MessageSource source, MessageType type, MessageLevel level, const String& message, const String& scriptId, unsigned lineNumber, unsigned columnNumber, ScriptState* state, unsigned long requestIdentifier = 0); |
+ void addMessageToConsole(ExecutionContext* context, ConsoleMessage* consoleMessage); |
[Console, Debugger] |
- void addMessageToConsole(ExecutionContext* context, MessageSource source, MessageType type, MessageLevel level, const String& message, ScriptState* state, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, unsigned long requestIdentifier = 0); |
+ void addConsoleAPIMessageToConsole(ExecutionContext* context, MessageType type, MessageLevel level, const String& message, ScriptState* state, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, unsigned long requestIdentifier = 0); |
[Console] |
void consoleCount(ExecutionContext* context, ScriptState* state, PassRefPtrWillBeRawPtr<ScriptArguments> arguments); |
@@ -477,10 +506,14 @@ interface InspectorConsoleInstrumentation { |
void consoleTimelineEnd([Keep] ExecutionContext* context, const String& title, ScriptState* state); |
[Profiler, Inline=FastReturn] |
- void consoleProfile(ExecutionContext* context, const String& title, ScriptState* state); |
+ void consoleProfile([Keep] ExecutionContext* context, const String& title); |
[Profiler, Inline=FastReturn] |
- void consoleProfileEnd(ExecutionContext* context, const String& title, ScriptState* state); |
+ void consoleProfileEnd(ExecutionContext* context, const String& title); |
+ |
+ //FIXME: remove when we move console message storage from InspectorConsoleAgent to FrameConsole |
+ [Console] |
+ void adoptWorkerConsoleMessages(ExecutionContext* context, WorkerGlobalScopeProxy* proxy); |
} |
interface InspectorOverrides { |