Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(462)

Side by Side Diff: Source/WebCore/inspector/InspectorInstrumentation.h

Issue 8028048: Merge 95093 - 2011-09-13 Pavel Feldman <pfeldman@google.com> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | Source/WebCore/inspector/InspectorInstrumentation.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier , const ResourceError&); 131 static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier , const ResourceError&);
132 static void resourceRetrievedByXMLHttpRequest(ScriptExecutionContext*, unsig ned long identifier, const String& sourceString, const String& url, const String & sendURL, unsigned sendLineNumber); 132 static void resourceRetrievedByXMLHttpRequest(ScriptExecutionContext*, unsig ned long identifier, const String& sourceString, const String& url, const String & sendURL, unsigned sendLineNumber);
133 static void didReceiveXHRResponse(ScriptExecutionContext*, unsigned long ide ntifier); 133 static void didReceiveXHRResponse(ScriptExecutionContext*, unsigned long ide ntifier);
134 static void willLoadXHRSynchronously(ScriptExecutionContext*); 134 static void willLoadXHRSynchronously(ScriptExecutionContext*);
135 static void didLoadXHRSynchronously(ScriptExecutionContext*); 135 static void didLoadXHRSynchronously(ScriptExecutionContext*);
136 static void scriptImported(ScriptExecutionContext*, unsigned long identifier , const String& sourceString); 136 static void scriptImported(ScriptExecutionContext*, unsigned long identifier , const String& sourceString);
137 static void domContentLoadedEventFired(Frame*, const KURL&); 137 static void domContentLoadedEventFired(Frame*, const KURL&);
138 static void loadEventFired(Frame*, const KURL&); 138 static void loadEventFired(Frame*, const KURL&);
139 static void frameDetachedFromParent(Frame*); 139 static void frameDetachedFromParent(Frame*);
140 static void didCommitLoad(Frame*, DocumentLoader*); 140 static void didCommitLoad(Frame*, DocumentLoader*);
141 static void frameDestroyed(Frame*);
142 static void loaderDetachedFromFrame(Frame*, DocumentLoader*); 141 static void loaderDetachedFromFrame(Frame*, DocumentLoader*);
143 142
144 static InspectorInstrumentationCookie willWriteHTML(Document*, unsigned int length, unsigned int startLine); 143 static InspectorInstrumentationCookie willWriteHTML(Document*, unsigned int length, unsigned int startLine);
145 static void didWriteHTML(const InspectorInstrumentationCookie&, unsigned int endLine); 144 static void didWriteHTML(const InspectorInstrumentationCookie&, unsigned int endLine);
146 145
147 static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLe vel, const String& message, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallSt ack>); 146 static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLe vel, const String& message, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallSt ack>);
148 static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLe vel, const String& message, unsigned lineNumber, const String&); 147 static void addMessageToConsole(Page*, MessageSource, MessageType, MessageLe vel, const String& message, unsigned lineNumber, const String&);
149 static void consoleCount(Page*, PassRefPtr<ScriptArguments>, PassRefPtr<Scri ptCallStack>); 148 static void consoleCount(Page*, PassRefPtr<ScriptArguments>, PassRefPtr<Scri ptCallStack>);
150 static void startConsoleTiming(Page*, const String& title); 149 static void startConsoleTiming(Page*, const String& title);
151 static void stopConsoleTiming(Page*, const String& title, PassRefPtr<ScriptC allStack>); 150 static void stopConsoleTiming(Page*, const String& title, PassRefPtr<ScriptC allStack>);
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 static void didFailLoadingImpl(InstrumentingAgents*, unsigned long identifie r, DocumentLoader*, const ResourceError&); 259 static void didFailLoadingImpl(InstrumentingAgents*, unsigned long identifie r, DocumentLoader*, const ResourceError&);
261 static void resourceRetrievedByXMLHttpRequestImpl(InstrumentingAgents*, unsi gned long identifier, const String& sourceString, const String& url, const Strin g& sendURL, unsigned sendLineNumber); 260 static void resourceRetrievedByXMLHttpRequestImpl(InstrumentingAgents*, unsi gned long identifier, const String& sourceString, const String& url, const Strin g& sendURL, unsigned sendLineNumber);
262 static void didReceiveXHRResponseImpl(InstrumentingAgents*, unsigned long id entifier); 261 static void didReceiveXHRResponseImpl(InstrumentingAgents*, unsigned long id entifier);
263 static void willLoadXHRSynchronouslyImpl(InstrumentingAgents*); 262 static void willLoadXHRSynchronouslyImpl(InstrumentingAgents*);
264 static void didLoadXHRSynchronouslyImpl(InstrumentingAgents*); 263 static void didLoadXHRSynchronouslyImpl(InstrumentingAgents*);
265 static void scriptImportedImpl(InstrumentingAgents*, unsigned long identifie r, const String& sourceString); 264 static void scriptImportedImpl(InstrumentingAgents*, unsigned long identifie r, const String& sourceString);
266 static void domContentLoadedEventFiredImpl(InstrumentingAgents*, Frame*, con st KURL&); 265 static void domContentLoadedEventFiredImpl(InstrumentingAgents*, Frame*, con st KURL&);
267 static void loadEventFiredImpl(InstrumentingAgents*, Frame*, const KURL&); 266 static void loadEventFiredImpl(InstrumentingAgents*, Frame*, const KURL&);
268 static void frameDetachedFromParentImpl(InstrumentingAgents*, Frame*); 267 static void frameDetachedFromParentImpl(InstrumentingAgents*, Frame*);
269 static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*); 268 static void didCommitLoadImpl(InstrumentingAgents*, Page*, DocumentLoader*);
270 static void frameDestroyedImpl(InstrumentingAgents*, Frame*);
271 static void loaderDetachedFromFrameImpl(InstrumentingAgents*, DocumentLoader *); 269 static void loaderDetachedFromFrameImpl(InstrumentingAgents*, DocumentLoader *);
272 270
273 static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents* , unsigned int length, unsigned int startLine); 271 static InspectorInstrumentationCookie willWriteHTMLImpl(InstrumentingAgents* , unsigned int length, unsigned int startLine);
274 static void didWriteHTMLImpl(const InspectorInstrumentationCookie&, unsigned int endLine); 272 static void didWriteHTMLImpl(const InspectorInstrumentationCookie&, unsigned int endLine);
275 273
276 static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, Mes sageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, Pass RefPtr<ScriptCallStack>); 274 static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, Mes sageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, Pass RefPtr<ScriptCallStack>);
277 static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, Mes sageType, MessageLevel, const String& message, unsigned lineNumber, const String & sourceId); 275 static void addMessageToConsoleImpl(InstrumentingAgents*, MessageSource, Mes sageType, MessageLevel, const String& message, unsigned lineNumber, const String & sourceId);
278 static void consoleCountImpl(InstrumentingAgents*, PassRefPtr<ScriptArgument s>, PassRefPtr<ScriptCallStack>); 276 static void consoleCountImpl(InstrumentingAgents*, PassRefPtr<ScriptArgument s>, PassRefPtr<ScriptCallStack>);
279 static void startConsoleTimingImpl(InstrumentingAgents*, const String& title ); 277 static void startConsoleTimingImpl(InstrumentingAgents*, const String& title );
280 static void stopConsoleTimingImpl(InstrumentingAgents*, const String& title, PassRefPtr<ScriptCallStack>); 278 static void stopConsoleTimingImpl(InstrumentingAgents*, const String& title, PassRefPtr<ScriptCallStack>);
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 if (!frame) 858 if (!frame)
861 return; 859 return;
862 Page* page = frame->page(); 860 Page* page = frame->page();
863 if (!page) 861 if (!page)
864 return; 862 return;
865 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(pa ge)) 863 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(pa ge))
866 didCommitLoadImpl(instrumentingAgents, page, loader); 864 didCommitLoadImpl(instrumentingAgents, page, loader);
867 #endif 865 #endif
868 } 866 }
869 867
870 inline void InspectorInstrumentation::frameDestroyed(Frame* frame)
871 {
872 #if ENABLE(INSPECTOR)
873 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(f rame))
874 frameDestroyedImpl(instrumentingAgents, frame);
875 #endif
876 }
877
878 inline void InspectorInstrumentation::loaderDetachedFromFrame(Frame* frame, Docu mentLoader* loader) 868 inline void InspectorInstrumentation::loaderDetachedFromFrame(Frame* frame, Docu mentLoader* loader)
879 { 869 {
880 #if ENABLE(INSPECTOR) 870 #if ENABLE(INSPECTOR)
881 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(f rame)) 871 if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(f rame))
882 loaderDetachedFromFrameImpl(instrumentingAgents, loader); 872 loaderDetachedFromFrameImpl(instrumentingAgents, loader);
883 #endif 873 #endif
884 } 874 }
885 875
886 inline InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTML(Do cument* document, unsigned int length, unsigned int startLine) 876 inline InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTML(Do cument* document, unsigned int length, unsigned int startLine)
887 { 877 {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
1039 { 1029 {
1040 if (document) 1030 if (document)
1041 return instrumentingAgentsForPage(document->page()); 1031 return instrumentingAgentsForPage(document->page());
1042 return 0; 1032 return 0;
1043 } 1033 }
1044 #endif 1034 #endif
1045 1035
1046 } // namespace WebCore 1036 } // namespace WebCore
1047 1037
1048 #endif // !defined(InspectorInstrumentation_h) 1038 #endif // !defined(InspectorInstrumentation_h)
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/InspectorInstrumentation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698