Index: core/inspector/InspectorInstrumentation.idl |
diff --git a/core/inspector/InspectorInstrumentation.idl b/core/inspector/InspectorInstrumentation.idl |
index d1d5b3be04bad18b0ca663c9f2cd43adf1a8c1ab..1970ed8dfb87f516f31e8f1371dbe5432500aa27 100644 |
--- a/core/inspector/InspectorInstrumentation.idl |
+++ b/core/inspector/InspectorInstrumentation.idl |
@@ -286,7 +286,7 @@ interface InspectorInstrumentation { |
[Resource] |
void markResourceAsCached(Page*, unsigned long identifier); |
- [Timeline, Resource, Console] // Console should come AFTER Resource notification, front-end relies on this. |
+ [Timeline, Resource] |
void didReceiveResourceResponse([Keep] LocalFrame*, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*); |
[Inline=Forward] |
@@ -340,7 +340,7 @@ interface InspectorInstrumentation { |
[Canvas, Page] |
void frameDetachedFromParent([Keep] LocalFrame*); |
- [Console, Resource, DOM, Canvas, Page, PageDebugger] |
+ [Resource, DOM, Canvas, Page, PageDebugger] |
void didCommitLoad([Keep] LocalFrame*, DocumentLoader*); |
[DOM, Inline=FastReturn] |
@@ -392,14 +392,14 @@ interface InspectorInstrumentation { |
void didDispatchDOMStorageEvent(Page* page, const String& key, const String& oldValue, const String& newValue, StorageType storageType, SecurityOrigin* securityOrigin); |
[Worker] |
- void didStartWorkerGlobalScope(ExecutionContext*, WorkerGlobalScopeProxy* proxy, const KURL& url); |
+ void didStartWorker(ExecutionContext*, WorkerInspectorProxy* proxy, const KURL& url); |
+ |
+ [Worker] |
+ void workerTerminated(ExecutionContext*, WorkerInspectorProxy* proxy); |
[WorkerRuntime] |
void willEvaluateWorkerScript([Keep] WorkerGlobalScope* context, int workerThreadStartMode); |
- [Worker] |
- void workerGlobalScopeTerminated(ExecutionContext*, WorkerGlobalScopeProxy* proxy); |
- |
[Profiler, Timeline] |
void willProcessTask(WorkerGlobalScope* context); |
@@ -480,20 +480,13 @@ interface InspectorConsoleInstrumentation { |
class ConsoleMessage; |
- // Use the same implementation as above as a similar method dispatched on Page. |
- [Console] |
- void addMessageToConsole(ExecutionContext* context, ConsoleMessage* consoleMessage); |
- |
[Console, Debugger] |
- 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); |
+ void addMessageToConsole(ExecutionContext* context, ConsoleMessage* consoleMessage); |
- [Timeline, Console] |
+ [Timeline] |
void consoleTime([Keep] ExecutionContext* context, const String& title); |
- [Console, Timeline] |
+ [Timeline] |
void consoleTimeEnd([Keep] ExecutionContext* context, const String& title, ScriptState* state); |
[Timeline, Inline=FastReturn] |
@@ -511,9 +504,8 @@ class ConsoleMessage; |
[Profiler, Inline=FastReturn] |
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); |
+ void consoleMessagesCleared(ExecutionContext* context); |
} |
interface InspectorOverrides { |
@@ -522,6 +514,9 @@ interface InspectorOverrides { |
[Worker, Inline=FastReturn] |
bool shouldPauseDedicatedWorkerOnStart(ExecutionContext* context); |
+ |
+ [Resource, Inline=FastReturn] |
+ bool shouldForceCORSPreflight(Document*); |
} |