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

Side by Side Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 1903953002: [DevTools] Move from InstrumentingAgents to InstrumentingSessions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-discard-agent
Patch Set: rebased Created 4 years, 8 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) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "core/frame/FrameConsole.h" 44 #include "core/frame/FrameConsole.h"
45 #include "core/frame/FrameHost.h" 45 #include "core/frame/FrameHost.h"
46 #include "core/frame/FrameView.h" 46 #include "core/frame/FrameView.h"
47 #include "core/frame/LocalDOMWindow.h" 47 #include "core/frame/LocalDOMWindow.h"
48 #include "core/frame/Settings.h" 48 #include "core/frame/Settings.h"
49 #include "core/html/HTMLFrameElementBase.h" 49 #include "core/html/HTMLFrameElementBase.h"
50 #include "core/html/HTMLPlugInElement.h" 50 #include "core/html/HTMLPlugInElement.h"
51 #include "core/input/EventHandler.h" 51 #include "core/input/EventHandler.h"
52 #include "core/inspector/ConsoleMessageStorage.h" 52 #include "core/inspector/ConsoleMessageStorage.h"
53 #include "core/inspector/InspectorInstrumentation.h" 53 #include "core/inspector/InspectorInstrumentation.h"
54 #include "core/inspector/InstrumentingAgents.h" 54 #include "core/inspector/InspectorSession.h"
55 #include "core/layout/HitTestResult.h" 55 #include "core/layout/HitTestResult.h"
56 #include "core/layout/LayoutView.h" 56 #include "core/layout/LayoutView.h"
57 #include "core/layout/api/LayoutViewItem.h" 57 #include "core/layout/api/LayoutViewItem.h"
58 #include "core/layout/compositing/PaintLayerCompositor.h" 58 #include "core/layout/compositing/PaintLayerCompositor.h"
59 #include "core/loader/FrameLoadRequest.h" 59 #include "core/loader/FrameLoadRequest.h"
60 #include "core/loader/FrameLoaderClient.h" 60 #include "core/loader/FrameLoaderClient.h"
61 #include "core/loader/NavigationScheduler.h" 61 #include "core/loader/NavigationScheduler.h"
62 #include "core/page/ChromeClient.h" 62 #include "core/page/ChromeClient.h"
63 #include "core/page/FocusController.h" 63 #include "core/page/FocusController.h"
64 #include "core/page/Page.h" 64 #include "core/page/Page.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 LocalFrame::~LocalFrame() 234 LocalFrame::~LocalFrame()
235 { 235 {
236 // Verify that the FrameView has been cleared as part of detaching 236 // Verify that the FrameView has been cleared as part of detaching
237 // the frame owner. 237 // the frame owner.
238 ASSERT(!m_view); 238 ASSERT(!m_view);
239 } 239 }
240 240
241 DEFINE_TRACE(LocalFrame) 241 DEFINE_TRACE(LocalFrame)
242 { 242 {
243 visitor->trace(m_instrumentingAgents); 243 visitor->trace(m_instrumentingSessions);
244 visitor->trace(m_loader); 244 visitor->trace(m_loader);
245 visitor->trace(m_navigationScheduler); 245 visitor->trace(m_navigationScheduler);
246 visitor->trace(m_view); 246 visitor->trace(m_view);
247 visitor->trace(m_domWindow); 247 visitor->trace(m_domWindow);
248 visitor->trace(m_pagePopupOwner); 248 visitor->trace(m_pagePopupOwner);
249 visitor->trace(m_script); 249 visitor->trace(m_script);
250 visitor->trace(m_editor); 250 visitor->trace(m_editor);
251 visitor->trace(m_spellChecker); 251 visitor->trace(m_spellChecker);
252 visitor->trace(m_selection); 252 visitor->trace(m_selection);
253 visitor->trace(m_eventHandler); 253 visitor->trace(m_eventHandler);
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 , m_eventHandler(new EventHandler(this)) 781 , m_eventHandler(new EventHandler(this))
782 , m_console(FrameConsole::create(*this)) 782 , m_console(FrameConsole::create(*this))
783 , m_inputMethodController(InputMethodController::create(*this)) 783 , m_inputMethodController(InputMethodController::create(*this))
784 , m_navigationDisableCount(0) 784 , m_navigationDisableCount(0)
785 , m_pageZoomFactor(parentPageZoomFactor(this)) 785 , m_pageZoomFactor(parentPageZoomFactor(this))
786 , m_textZoomFactor(parentTextZoomFactor(this)) 786 , m_textZoomFactor(parentTextZoomFactor(this))
787 , m_inViewSourceMode(false) 787 , m_inViewSourceMode(false)
788 , m_serviceRegistry(serviceRegistry) 788 , m_serviceRegistry(serviceRegistry)
789 { 789 {
790 if (isLocalRoot()) 790 if (isLocalRoot())
791 m_instrumentingAgents = InstrumentingAgents::create(); 791 m_instrumentingSessions = new InstrumentingSessions();
792 else 792 else
793 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 793 m_instrumentingSessions = localFrameRoot()->m_instrumentingSessions;
794 } 794 }
795 795
796 WebFrameScheduler* LocalFrame::frameScheduler() 796 WebFrameScheduler* LocalFrame::frameScheduler()
797 { 797 {
798 if (!m_frameScheduler.get()) 798 if (!m_frameScheduler.get())
799 m_frameScheduler = page()->chromeClient().createFrameScheduler(client()- >frameBlameContext()); 799 m_frameScheduler = page()->chromeClient().createFrameScheduler(client()- >frameBlameContext());
800 800
801 ASSERT(m_frameScheduler.get()); 801 ASSERT(m_frameScheduler.get());
802 return m_frameScheduler.get(); 802 return m_frameScheduler.get();
803 } 803 }
(...skipping 12 matching lines...) Expand all
816 { 816 {
817 m_frame->disableNavigation(); 817 m_frame->disableNavigation();
818 } 818 }
819 819
820 FrameNavigationDisabler::~FrameNavigationDisabler() 820 FrameNavigationDisabler::~FrameNavigationDisabler()
821 { 821 {
822 m_frame->enableNavigation(); 822 m_frame->enableNavigation();
823 } 823 }
824 824
825 } // namespace blink 825 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.h ('k') | third_party/WebKit/Source/core/inspector/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698