Index: core/inspector/InspectorInstrumentation.idl |
diff --git a/core/inspector/InspectorInstrumentation.idl b/core/inspector/InspectorInstrumentation.idl |
index b070934c399e06af54180f49748e7bd24ff2566b..260db42c4370bfaa5c0e02d3119bdd8c788f8745 100644 |
--- a/core/inspector/InspectorInstrumentation.idl |
+++ b/core/inspector/InspectorInstrumentation.idl |
@@ -138,10 +138,10 @@ interface InspectorInstrumentation { |
void didRemoveTimer([Keep] ExecutionContext*, int timerId); |
[Debugger, Inline=FastReturn] |
- InspectorInstrumentationCookie willCallFunction([Keep] ExecutionContext*, const DevToolsFunctionInfo&); |
+ InspectorInstrumentationCookie willExecuteScript(ExecutionContext*, int scriptId); |
[Debugger, Inline=FastReturn] |
- void didCallFunction(const InspectorInstrumentationCookie&); |
+ void didExecuteScript(const InspectorInstrumentationCookie&); |
[AsyncCallTracker, Inline=FastReturn] |
void didEnqueueEvent([Keep] EventTarget*, Event*); |
@@ -152,7 +152,7 @@ interface InspectorInstrumentation { |
[AsyncCallTracker, DOMDebugger, Inline=FastReturn] |
InspectorInstrumentationCookie willHandleEvent([Keep] EventTarget*, Event*, EventListener* listener, bool useCapture); |
- [AsyncCallTracker, Debugger, Inline=FastReturn] |
+ [AsyncCallTracker, DOMDebugger, Inline=FastReturn] |
void didHandleEvent(const InspectorInstrumentationCookie&); |
[AsyncCallTracker, Inline=FastReturn] |
@@ -179,11 +179,8 @@ interface InspectorInstrumentation { |
[AsyncCallTracker, Inline=FastReturn] |
void didPerformExecutionContextTask(ExecutionContext*); |
- [Debugger, DOMDebugger, Inline=FastReturn] |
- InspectorInstrumentationCookie willEvaluateScript([Keep] LocalFrame*, const String& url, int lineNumber); |
- |
- [Debugger, Inline=FastReturn] |
- void didEvaluateScript(const InspectorInstrumentationCookie&); |
+ [DOMDebugger, Inline=FastReturn] |
+ void willEvaluateScript(ExecutionContext*); |
[PageRuntime] |
void didCreateScriptContext([Keep] LocalFrame*, ScriptState*, SecurityOrigin*, int worldId); |
@@ -194,14 +191,11 @@ interface InspectorInstrumentation { |
[AsyncCallTracker, DOMDebugger, Inline=FastReturn] |
InspectorInstrumentationCookie willFireTimer([Keep] ExecutionContext*, int timerId); |
- [AsyncCallTracker, Debugger, Inline=FastReturn] |
+ [AsyncCallTracker, DOMDebugger, Inline=FastReturn] |
void didFireTimer(const InspectorInstrumentationCookie&); |
[Page, Inline=FastReturn] |
- void didLayout(LocalFrame*); |
- |
- [Page, Inline=FastReturn] |
- void didScroll(LocalFrame*); |
+ void didUpdateLayout(LocalFrame*); |
[Page, Inline=FastReturn] |
void didResizeMainFrame(LocalFrame*); |
@@ -210,12 +204,12 @@ interface InspectorInstrumentation { |
void didDispatchXHRLoadendEvent(ExecutionContext*, XMLHttpRequest*); |
[LayerTree, Inline=FastReturn] |
- void didPaint([Keep] LayoutObject*, const GraphicsLayer*, GraphicsContext*, const LayoutRect&); |
+ void didPaint([Keep] LayoutObject*, const GraphicsLayer*, GraphicsContext&, const LayoutRect&); |
[Resource, Inline=FastReturn] |
InspectorInstrumentationCookie willRecalculateStyle([Keep] Document*); |
- [Resource, Inline=FastReturn] |
+ [Resource, Page, Inline=FastReturn] |
void didRecalculateStyle(const InspectorInstrumentationCookie&, int elementCount); |
[Resource, Inline=FastReturn] |
@@ -225,7 +219,10 @@ interface InspectorInstrumentation { |
void applyUserAgentOverride(LocalFrame*, String* userAgent); |
[Resource] |
- void willSendRequest(LocalFrame*, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse, const FetchInitiatorInfo&); |
+ void didBlockRequest([Keep] LocalFrame*, const ResourceRequest&, DocumentLoader*, const FetchInitiatorInfo&, ResourceRequestBlockedReason); |
+ |
+ [Resource] |
+ void willSendRequest([Keep] LocalFrame*, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse, const FetchInitiatorInfo&); |
[Resource] |
void markResourceAsCached(LocalFrame*, unsigned long identifier); |
@@ -258,13 +255,13 @@ interface InspectorInstrumentation { |
void willSendEventSourceRequest(ExecutionContext*, ThreadableLoaderClient* eventSource); |
[Resource] |
- void willDispachEventSourceEvent(ExecutionContext*, ThreadableLoaderClient* eventSource, const AtomicString& eventName, const AtomicString& eventId, const Vector<UChar>& data); |
+ void willDispatchEventSourceEvent(ExecutionContext*, ThreadableLoaderClient* eventSource, const AtomicString& eventName, const AtomicString& eventId, const String& data); |
[Resource] |
void didFinishEventSourceRequest(ExecutionContext*, ThreadableLoaderClient* eventSource); |
[AsyncCallTracker, Resource] |
- void willLoadXHR(ExecutionContext*, XMLHttpRequest* xhr, ThreadableLoaderClient* client, const AtomicString& method, const KURL& url, bool async, PassRefPtr<FormData>, const HTTPHeaderMap& headers, bool includeCredentials); |
+ void willLoadXHR(ExecutionContext*, XMLHttpRequest* xhr, ThreadableLoaderClient* client, const AtomicString& method, const KURL& url, bool async, PassRefPtr<EncodedFormData>, const HTTPHeaderMap& headers, bool includeCredentials); |
[Resource] |
void didFailXHRLoading([Keep] ExecutionContext*, XMLHttpRequest* xhr, ThreadableLoaderClient* client, const AtomicString& method, const String& url); |
@@ -273,6 +270,15 @@ interface InspectorInstrumentation { |
void didFinishXHRLoading([Keep] ExecutionContext*, XMLHttpRequest* xhr, ThreadableLoaderClient* client, const AtomicString& method, const String& url); |
[Resource] |
+ void willStartFetch(ExecutionContext*, ThreadableLoaderClient*); |
+ |
+ [Resource] |
+ void didFailFetch(ExecutionContext*, ThreadableLoaderClient*); |
+ |
+ [Resource] |
+ void didFinishFetch([Keep] ExecutionContext*, ThreadableLoaderClient*, const AtomicString& method, const String& url); |
+ |
+ [Resource] |
void scriptImported(ExecutionContext*, unsigned long identifier, const String& sourceString); |
[Debugger] |
@@ -321,7 +327,7 @@ interface InspectorInstrumentation { |
void didRunJavaScriptDialog(const InspectorInstrumentationCookie&, bool result); |
[Inline=Forward] |
- void willDestroyResource(Resource* cachedResource); |
+ void removedResourceFromMemoryCache(Resource* cachedResource); |
[AsyncCallTracker, DOMDebugger] |
void didRequestAnimationFrame([Keep] ExecutionContext*, int callbackId); |
@@ -408,10 +414,13 @@ interface InspectorInstrumentation { |
void traceAsyncCallbackCompleted(const InspectorInstrumentationCookie&); |
[Animation, Inline=FastReturn] |
- void didCreateAnimation(Document*, Animation* player); |
+ void didCreateAnimation(Document*, unsigned); |
[Animation, Inline=FastReturn] |
- void didCancelAnimation(Document*, Animation* player); |
+ void animationPlayStateChanged(Document*, Animation*, Animation::AnimationPlayState oldPlayState, Animation::AnimationPlayState newPlayState); |
+ |
+ [Page, Inline=FastReturn] |
+ void windowCreated(LocalFrame* opener, LocalFrame* created); |
} |
interface InspectorConsoleInstrumentation { |