Index: core/inspector/InspectorInstrumentation.idl |
diff --git a/core/inspector/InspectorInstrumentation.idl b/core/inspector/InspectorInstrumentation.idl |
index b333401d763afc5c45f3fdaba9a0546d92d14dc4..02e859136093ef5dfcac6fe7febb38d474b68098 100644 |
--- a/core/inspector/InspectorInstrumentation.idl |
+++ b/core/inspector/InspectorInstrumentation.idl |
@@ -91,6 +91,21 @@ interface InspectorInstrumentation { |
[DOM, DOMDebugger, Inline=FastReturn] |
void didInvalidateStyleAttr([Keep] Node*); |
+ [DOM, Inline=FastReturn] |
+ void pseudoStateChanged([Keep] Node*); |
+ |
+ [CSS, Inline=FastReturn] |
+ void willMutateRules(CSSStyleSheet*); |
+ |
+ [CSS, Inline=FastReturn] |
+ void didMutateRules([Keep] CSSStyleSheet*); |
+ |
+ [CSS, Inline=FastReturn] |
+ void willMutateStyle(CSSStyleDeclaration*); |
+ |
+ [CSS, Inline=FastReturn] |
+ void didMutateStyle([Keep] CSSStyleDeclaration*, bool); |
+ |
[CSS, Inline=FastReturn] |
void activeStyleSheetsUpdated([Keep] Document*, const Vector<RefPtr<StyleSheet> >& newSheets); |
@@ -133,10 +148,10 @@ interface InspectorInstrumentation { |
[Timeline, Inline=FastReturn] |
void didScheduleResourceRequest([Keep] Document*, const String& url); |
- [DOMDebugger, Timeline, Inline=FastReturn] |
+ [DOMDebugger, Debugger, Timeline, Inline=FastReturn] |
void didInstallTimer([Keep] ExecutionContext*, int timerId, int timeout, bool singleShot); |
- [DOMDebugger, Timeline, Inline=FastReturn] |
+ [DOMDebugger, Debugger, Timeline, Inline=FastReturn] |
void didRemoveTimer([Keep] ExecutionContext*, int timerId); |
[Timeline, Inline=FastReturn] |
@@ -181,7 +196,7 @@ interface InspectorInstrumentation { |
[PageRuntime, Inline=FastReturn] |
void didCreateIsolatedContext([Keep] Frame*, ScriptState*, SecurityOrigin*); |
- [DOMDebugger, Timeline, Inline=FastReturn] |
+ [DOMDebugger, Debugger, Timeline, Inline=FastReturn] |
InspectorInstrumentationCookie willFireTimer([Keep] ExecutionContext*, int timerId); |
[Debugger, Timeline, Inline=FastReturn] |
@@ -221,10 +236,10 @@ interface InspectorInstrumentation { |
void didScrollLayer(RenderObject*); |
[Timeline, Inline=FastReturn] |
- void willPaint([Keep] RenderObject*); |
+ void willPaint([Keep] RenderObject*, const GraphicsLayer*); |
[Timeline, Page, LayerTree, Inline=FastReturn] |
- void didPaint([Keep] RenderObject*, GraphicsContext*, const LayoutRect&); |
+ void didPaint([Keep] RenderObject*, const GraphicsLayer*, GraphicsContext*, const LayoutRect&); |
[Timeline, Inline=FastReturn] |
void willPaintImage([Keep] RenderImage*); |
@@ -248,6 +263,9 @@ interface InspectorInstrumentation { |
void applyUserAgentOverride(Frame*, String* userAgent); |
[Page, Inline=FastReturn] |
+ bool applyViewportStyleOverride(Document*, StyleResolver*); |
+ |
+ [Page, Inline=FastReturn] |
void applyEmulatedMedia(Frame*, String* media); |
[Timeline, Resource] |
@@ -264,11 +282,8 @@ interface InspectorInstrumentation { |
[Timeline, Inline=FastReturn] |
void didReceiveResourceData(const InspectorInstrumentationCookie&); |
- [Timeline] |
- InspectorInstrumentationCookie willReceiveResourceResponse([Keep] Frame*, unsigned long identifier, const ResourceResponse&); |
- |
[Timeline, Resource, Console] // Console should come AFTER Resource notification, front-end relies on this. |
- void didReceiveResourceResponse(const InspectorInstrumentationCookie&, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*); |
+ void didReceiveResourceResponse([Keep] Frame*, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*); |
[Inline=Forward] |
void continueAfterXFrameOptionsDenied(Frame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r); |
@@ -286,7 +301,7 @@ interface InspectorInstrumentation { |
void didFinishLoading(Frame* frame, unsigned long identifier, DocumentLoader*, double finishTime); |
[Resource] |
- void didReceiveCORSRedirectResponse(Frame*, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*); |
+ void didReceiveCORSRedirectResponse([Keep] Frame*, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*); |
[Timeline, Resource, Console] // Console should come AFTER Resource notification, front-end relies on this. |
void didFailLoading(Frame* frame, unsigned long identifier, DocumentLoader*, const ResourceError&); |
@@ -295,16 +310,13 @@ interface InspectorInstrumentation { |
void documentThreadableLoaderStartedLoadingForClient(ExecutionContext*, unsigned long identifier, ThreadableLoaderClient* client); |
[Resource] |
- void willLoadXHR(ExecutionContext*, ThreadableLoaderClient* client, const String& 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<FormData>, const HTTPHeaderMap& headers, bool includeCredentials); |
[Resource] |
- void didFailXHRLoading(ExecutionContext*, ThreadableLoaderClient* client); |
+ void didFailXHRLoading(ExecutionContext*, XMLHttpRequest* xhr, ThreadableLoaderClient* client); |
[Console, Resource] |
- void didFinishXHRLoading(ExecutionContext*, ThreadableLoaderClient* client, unsigned long identifier, ScriptString sourceString, const String& url, const String& sendURL, unsigned sendLineNumber); |
- |
- [Resource] |
- void didReceiveXHRResponse(ExecutionContext*, unsigned long identifier); |
+ void didFinishXHRLoading(ExecutionContext*, XMLHttpRequest* xhr, ThreadableLoaderClient* client, unsigned long identifier, ScriptString sourceString, const String& url, const String& sendURL, unsigned sendLineNumber); |
[Resource] |
void scriptImported(ExecutionContext*, unsigned long identifier, const String& sourceString); |
@@ -327,9 +339,6 @@ interface InspectorInstrumentation { |
[Canvas, Page, CSS] |
void frameDetachedFromParent([Keep] Frame*); |
- [Page, Inline=FastReturn] |
- void childDocumentOpened([Keep] Document*); |
- |
[Console, Resource, CSS, Database, DOM, Inspector, Canvas, Page, PageDebugger] |
void didCommitLoad([Keep] Frame*, DocumentLoader*); |
@@ -366,16 +375,16 @@ interface InspectorInstrumentation { |
[Timeline, Inline=FastReturn] |
void didWriteHTML(const InspectorInstrumentationCookie&, unsigned endLine); |
- [DOMDebugger, Timeline] |
+ [DOMDebugger, Debugger, Timeline] |
void didRequestAnimationFrame([Keep] Document*, int callbackId); |
- [DOMDebugger, Timeline] |
+ [DOMDebugger, Debugger, Timeline] |
void didCancelAnimationFrame([Keep] Document*, int callbackId); |
- [DOMDebugger, Timeline] |
+ [DOMDebugger, Debugger, Timeline] |
InspectorInstrumentationCookie willFireAnimationFrame([Keep] Document*, int callbackId); |
- [Timeline, Inline=FastReturn] |
+ [Timeline, Debugger, Inline=FastReturn] |
void didFireAnimationFrame(const InspectorInstrumentationCookie&); |
[DOMStorage, Inline=FastReturn] |
@@ -443,7 +452,6 @@ interface InspectorConsoleInstrumentation { |
#include "core/inspector/ScriptArguments.h" |
#include "core/inspector/ScriptCallStack.h" |
-#include "core/inspector/ScriptProfile.h" |
// FIXME: Convert to ScriptArguments to match non-worker context. |
// Use the same implementation as above as a similar method dispatched on Page. |
@@ -475,8 +483,11 @@ interface InspectorConsoleInstrumentation { |
[Console, Inline=FastReturn] |
void consoleTimelineEnd([Keep] ExecutionContext* context, const String& title, ScriptState* state); |
- [Profiler] |
- void addProfile(ExecutionContext* context, PassRefPtr<ScriptProfile> profile, PassRefPtr<ScriptCallStack> callStack); |
+ [Profiler, Inline=FastReturn] |
+ void consoleProfile(ExecutionContext* context, const String& title, ScriptState* state); |
+ |
+ [Profiler, Inline=FastReturn] |
+ void consoleProfileEnd(ExecutionContext* context, const String& title); |
} |
interface InspectorDatabaseInstrumentation { |
@@ -498,13 +509,10 @@ interface InspectorOverrides { |
GeolocationPosition* overrideGeolocationPosition(Page* page, [DefaultReturn] GeolocationPosition* position); |
[Page, Inline=FastReturn] |
- float overrideTextAutosizingFontScaleFactor(Page* page, [DefaultReturn] float fontScaleFactor); |
+ float overrideFontScaleFactor(Page* page, [DefaultReturn] float fontScaleFactor); |
[Page, Inline=FastReturn] |
bool overrideTextAutosizing(Page* page, [DefaultReturn] bool textAutosizing); |
- |
- [Profiler] |
- String getCurrentUserInitiatedProfileName(ExecutionContext* context, bool incrementProfileNumber); |
} |