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

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

Issue 2772613002: [instrumentation] Rename InspectorInstrumentation into CoreProbes (Closed)
Patch Set: sinkFor -> toCoreProbesSink Created 3 years, 9 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 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
9 * rights reserved. 9 * rights reserved.
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
(...skipping 15 matching lines...) Expand all
26 * along with this library; see the file COPYING.LIB. If not, write to 26 * along with this library; see the file COPYING.LIB. If not, write to
27 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 27 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
28 * Boston, MA 02110-1301, USA. 28 * Boston, MA 02110-1301, USA.
29 */ 29 */
30 30
31 #include "core/frame/LocalFrame.h" 31 #include "core/frame/LocalFrame.h"
32 32
33 #include <memory> 33 #include <memory>
34 34
35 #include "bindings/core/v8/ScriptController.h" 35 #include "bindings/core/v8/ScriptController.h"
36 #include "core/InspectorInstrumentationAgents.h" 36 #include "core/CoreProbesSink.h"
37 #include "core/dom/ChildFrameDisconnector.h" 37 #include "core/dom/ChildFrameDisconnector.h"
38 #include "core/dom/DocumentType.h" 38 #include "core/dom/DocumentType.h"
39 #include "core/dom/StyleChangeReason.h" 39 #include "core/dom/StyleChangeReason.h"
40 #include "core/editing/EditingUtilities.h" 40 #include "core/editing/EditingUtilities.h"
41 #include "core/editing/Editor.h" 41 #include "core/editing/Editor.h"
42 #include "core/editing/FrameSelection.h" 42 #include "core/editing/FrameSelection.h"
43 #include "core/editing/InputMethodController.h" 43 #include "core/editing/InputMethodController.h"
44 #include "core/editing/serializers/Serialization.h" 44 #include "core/editing/serializers/Serialization.h"
45 #include "core/editing/spellcheck/SpellChecker.h" 45 #include "core/editing/spellcheck/SpellChecker.h"
46 #include "core/events/Event.h" 46 #include "core/events/Event.h"
47 #include "core/frame/EventHandlerRegistry.h" 47 #include "core/frame/EventHandlerRegistry.h"
48 #include "core/frame/FrameConsole.h" 48 #include "core/frame/FrameConsole.h"
49 #include "core/frame/FrameHost.h" 49 #include "core/frame/FrameHost.h"
50 #include "core/frame/FrameView.h" 50 #include "core/frame/FrameView.h"
51 #include "core/frame/LocalDOMWindow.h" 51 #include "core/frame/LocalDOMWindow.h"
52 #include "core/frame/LocalFrameClient.h" 52 #include "core/frame/LocalFrameClient.h"
53 #include "core/frame/PerformanceMonitor.h" 53 #include "core/frame/PerformanceMonitor.h"
54 #include "core/frame/Settings.h" 54 #include "core/frame/Settings.h"
55 #include "core/frame/VisualViewport.h" 55 #include "core/frame/VisualViewport.h"
56 #include "core/html/HTMLFrameElementBase.h" 56 #include "core/html/HTMLFrameElementBase.h"
57 #include "core/html/HTMLPlugInElement.h" 57 #include "core/html/HTMLPlugInElement.h"
58 #include "core/input/EventHandler.h" 58 #include "core/input/EventHandler.h"
59 #include "core/inspector/ConsoleMessage.h" 59 #include "core/inspector/ConsoleMessage.h"
60 #include "core/inspector/InspectorInstrumentation.h" 60 #include "core/instrumentation/CoreProbes.h"
61 #include "core/layout/HitTestResult.h" 61 #include "core/layout/HitTestResult.h"
62 #include "core/layout/LayoutView.h" 62 #include "core/layout/LayoutView.h"
63 #include "core/layout/api/LayoutPartItem.h" 63 #include "core/layout/api/LayoutPartItem.h"
64 #include "core/layout/api/LayoutViewItem.h" 64 #include "core/layout/api/LayoutViewItem.h"
65 #include "core/layout/compositing/PaintLayerCompositor.h" 65 #include "core/layout/compositing/PaintLayerCompositor.h"
66 #include "core/loader/FrameLoadRequest.h" 66 #include "core/loader/FrameLoadRequest.h"
67 #include "core/loader/NavigationScheduler.h" 67 #include "core/loader/NavigationScheduler.h"
68 #include "core/page/ChromeClient.h" 68 #include "core/page/ChromeClient.h"
69 #include "core/page/FocusController.h" 69 #include "core/page/FocusController.h"
70 #include "core/page/Page.h" 70 #include "core/page/Page.h"
(...skipping 791 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 m_eventHandler(new EventHandler(*this)), 862 m_eventHandler(new EventHandler(*this)),
863 m_console(FrameConsole::create(*this)), 863 m_console(FrameConsole::create(*this)),
864 m_inputMethodController(InputMethodController::create(*this)), 864 m_inputMethodController(InputMethodController::create(*this)),
865 m_navigationDisableCount(0), 865 m_navigationDisableCount(0),
866 m_pageZoomFactor(parentPageZoomFactor(this)), 866 m_pageZoomFactor(parentPageZoomFactor(this)),
867 m_textZoomFactor(parentTextZoomFactor(this)), 867 m_textZoomFactor(parentTextZoomFactor(this)),
868 m_inViewSourceMode(false), 868 m_inViewSourceMode(false),
869 m_interfaceProvider(interfaceProvider), 869 m_interfaceProvider(interfaceProvider),
870 m_interfaceRegistry(interfaceRegistry) { 870 m_interfaceRegistry(interfaceRegistry) {
871 if (isLocalRoot()) { 871 if (isLocalRoot()) {
872 m_instrumentingAgents = new InspectorInstrumentationAgents(); 872 m_instrumentingAgents = new CoreProbesSink();
873 m_performanceMonitor = new PerformanceMonitor(this); 873 m_performanceMonitor = new PerformanceMonitor(this);
874 } else { 874 } else {
875 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents; 875 m_instrumentingAgents = localFrameRoot()->m_instrumentingAgents;
876 m_performanceMonitor = localFrameRoot()->m_performanceMonitor; 876 m_performanceMonitor = localFrameRoot()->m_performanceMonitor;
877 } 877 }
878 } 878 }
879 879
880 WebFrameScheduler* LocalFrame::frameScheduler() { 880 WebFrameScheduler* LocalFrame::frameScheduler() {
881 return m_frameScheduler.get(); 881 return m_frameScheduler.get();
882 } 882 }
(...skipping 30 matching lines...) Expand all
913 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 913 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
914 m_frame->client()->frameBlameContext()->Enter(); 914 m_frame->client()->frameBlameContext()->Enter();
915 } 915 }
916 916
917 ScopedFrameBlamer::~ScopedFrameBlamer() { 917 ScopedFrameBlamer::~ScopedFrameBlamer() {
918 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext()) 918 if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
919 m_frame->client()->frameBlameContext()->Leave(); 919 m_frame->client()->frameBlameContext()->Leave();
920 } 920 }
921 921
922 } // namespace blink 922 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698