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

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

Issue 7945005: Merge 95093 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 642 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 #endif 653 #endif
654 if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent ()) 654 if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent ())
655 domAgent->setDocument(mainFrame->document()); 655 domAgent->setDocument(mainFrame->document());
656 656
657 inspectorAgent->didCommitLoad(); 657 inspectorAgent->didCommitLoad();
658 } 658 }
659 if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent( )) 659 if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent( ))
660 pageAgent->frameNavigated(loader); 660 pageAgent->frameNavigated(loader);
661 } 661 }
662 662
663 void InspectorInstrumentation::frameDestroyedImpl(InstrumentingAgents* instrumen tingAgents, Frame* frame)
664 {
665 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorP ageAgent())
666 inspectorPageAgent->frameDestroyed(frame);
667 }
668
669 void InspectorInstrumentation::loaderDetachedFromFrameImpl(InstrumentingAgents* instrumentingAgents, DocumentLoader* loader) 663 void InspectorInstrumentation::loaderDetachedFromFrameImpl(InstrumentingAgents* instrumentingAgents, DocumentLoader* loader)
670 { 664 {
671 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorP ageAgent()) 665 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorP ageAgent())
672 inspectorPageAgent->loaderDetachedFromFrame(loader); 666 inspectorPageAgent->loaderDetachedFromFrame(loader);
673 } 667 }
674 668
675 InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTMLImpl(Instr umentingAgents* instrumentingAgents, unsigned int length, unsigned int startLine ) 669 InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTMLImpl(Instr umentingAgents* instrumentingAgents, unsigned int length, unsigned int startLine )
676 { 670 {
677 int timelineAgentId = 0; 671 int timelineAgentId = 0;
678 if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTi melineAgent()) { 672 if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTi melineAgent()) {
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForPage(Page* page) 878 InstrumentingAgents* InspectorInstrumentation::instrumentingAgentsForPage(Page* page)
885 { 879 {
886 if (!page) 880 if (!page)
887 return 0; 881 return 0;
888 return instrumentationForPage(page); 882 return instrumentationForPage(page);
889 } 883 }
890 884
891 } // namespace WebCore 885 } // namespace WebCore
892 886
893 #endif // !ENABLE(INSPECTOR) 887 #endif // !ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « Source/WebCore/inspector/InspectorInstrumentation.h ('k') | Source/WebCore/inspector/InspectorPageAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698