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

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

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
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 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 #endif 633 #endif
634 if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent ()) 634 if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent ())
635 domAgent->setDocument(mainFrame->document()); 635 domAgent->setDocument(mainFrame->document());
636 636
637 inspectorAgent->didCommitLoad(); 637 inspectorAgent->didCommitLoad();
638 } 638 }
639 if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent( )) 639 if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent( ))
640 pageAgent->frameNavigated(loader); 640 pageAgent->frameNavigated(loader);
641 } 641 }
642 642
643 void InspectorInstrumentation::frameDestroyedImpl(InstrumentingAgents* instrumen tingAgents, Frame* frame)
644 {
645 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorP ageAgent())
646 inspectorPageAgent->frameDestroyed(frame);
647 }
648
649 void InspectorInstrumentation::loaderDetachedFromFrameImpl(InstrumentingAgents* instrumentingAgents, DocumentLoader* loader) 643 void InspectorInstrumentation::loaderDetachedFromFrameImpl(InstrumentingAgents* instrumentingAgents, DocumentLoader* loader)
650 { 644 {
651 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorP ageAgent()) 645 if (InspectorPageAgent* inspectorPageAgent = instrumentingAgents->inspectorP ageAgent())
652 inspectorPageAgent->loaderDetachedFromFrame(loader); 646 inspectorPageAgent->loaderDetachedFromFrame(loader);
653 } 647 }
654 648
655 InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTMLImpl(Instr umentingAgents* instrumentingAgents, unsigned int length, unsigned int startLine ) 649 InspectorInstrumentationCookie InspectorInstrumentation::willWriteHTMLImpl(Instr umentingAgents* instrumentingAgents, unsigned int length, unsigned int startLine )
656 { 650 {
657 int timelineAgentId = 0; 651 int timelineAgentId = 0;
658 if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTi melineAgent()) { 652 if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTi melineAgent()) {
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 return 0; 851 return 0;
858 InspectorTimelineAgent* timelineAgent = cookie.first->inspectorTimelineAgent (); 852 InspectorTimelineAgent* timelineAgent = cookie.first->inspectorTimelineAgent ();
859 if (timelineAgent && timelineAgent->id() == cookie.second) 853 if (timelineAgent && timelineAgent->id() == cookie.second)
860 return timelineAgent; 854 return timelineAgent;
861 return 0; 855 return 0;
862 } 856 }
863 857
864 } // namespace WebCore 858 } // namespace WebCore
865 859
866 #endif // !ENABLE(INSPECTOR) 860 #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