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

Side by Side Diff: Source/core/inspector/PageConsoleAgent.cpp

Issue 750983003: DevTools: remove Console.setTracingBasedTimeline call from startup. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review comments addressed Created 6 years 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/inspector/PageConsoleAgent.h ('k') | Source/core/inspector/WorkerConsoleAgent.h » ('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) 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 28 matching lines...) Expand all
39 #include "core/frame/FrameHost.h" 39 #include "core/frame/FrameHost.h"
40 #include "core/inspector/InjectedScriptHost.h" 40 #include "core/inspector/InjectedScriptHost.h"
41 #include "core/inspector/InjectedScriptManager.h" 41 #include "core/inspector/InjectedScriptManager.h"
42 #include "core/inspector/InspectorDOMAgent.h" 42 #include "core/inspector/InspectorDOMAgent.h"
43 #include "core/page/Page.h" 43 #include "core/page/Page.h"
44 44
45 namespace blink { 45 namespace blink {
46 46
47 int PageConsoleAgent::s_enabledAgentCount = 0; 47 int PageConsoleAgent::s_enabledAgentCount = 0;
48 48
49 PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent, InspectorTimelineAgent* timelineAgent, Page* page) 49 PageConsoleAgent::PageConsoleAgent(InjectedScriptManager* injectedScriptManager, InspectorDOMAgent* domAgent, Page* page)
50 : InspectorConsoleAgent(timelineAgent, injectedScriptManager) 50 : InspectorConsoleAgent(injectedScriptManager)
51 , m_inspectorDOMAgent(domAgent) 51 , m_inspectorDOMAgent(domAgent)
52 , m_page(page) 52 , m_page(page)
53 { 53 {
54 } 54 }
55 55
56 PageConsoleAgent::~PageConsoleAgent() 56 PageConsoleAgent::~PageConsoleAgent()
57 { 57 {
58 #if !ENABLE(OILPAN) 58 #if !ENABLE(OILPAN)
59 m_inspectorDOMAgent = nullptr; 59 m_inspectorDOMAgent = nullptr;
60 #endif 60 #endif
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 Node& ancestor = NodeTraversal::highestAncestorOrSelf(*node); 113 Node& ancestor = NodeTraversal::highestAncestorOrSelf(*node);
114 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR oot::AuthorShadowRoot) 114 if (!ancestor.isShadowRoot() || toShadowRoot(ancestor).type() == ShadowR oot::AuthorShadowRoot)
115 break; 115 break;
116 // User agent shadow root, keep climbing up. 116 // User agent shadow root, keep climbing up.
117 node = toShadowRoot(ancestor).host(); 117 node = toShadowRoot(ancestor).host();
118 } 118 }
119 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n ew InspectableNode(node))); 119 m_injectedScriptManager->injectedScriptHost()->addInspectedObject(adoptPtr(n ew InspectableNode(node)));
120 } 120 }
121 121
122 } // namespace blink 122 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/inspector/PageConsoleAgent.h ('k') | Source/core/inspector/WorkerConsoleAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698