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

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

Issue 323043002: Oilpan: Prepare moving InspectorAgent related classes to oilpan (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 6 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 | Annotate | Revision Log
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 #include "core/inspector/PageRuntimeAgent.h" 66 #include "core/inspector/PageRuntimeAgent.h"
67 #include "core/page/Page.h" 67 #include "core/page/Page.h"
68 #include "core/rendering/RenderLayer.h" 68 #include "core/rendering/RenderLayer.h"
69 #include "platform/PlatformMouseEvent.h" 69 #include "platform/PlatformMouseEvent.h"
70 70
71 namespace WebCore { 71 namespace WebCore {
72 72
73 InspectorController::InspectorController(Page* page, InspectorClient* inspectorC lient) 73 InspectorController::InspectorController(Page* page, InspectorClient* inspectorC lient)
74 : m_instrumentingAgents(InstrumentingAgents::create()) 74 : m_instrumentingAgents(InstrumentingAgents::create())
75 , m_injectedScriptManager(InjectedScriptManager::createForPage()) 75 , m_injectedScriptManager(InjectedScriptManager::createForPage())
76 , m_state(adoptPtr(new InspectorCompositeState(inspectorClient))) 76 , m_state(adoptPtrWillBeNoop(new InspectorCompositeState(inspectorClient)))
77 , m_overlay(InspectorOverlay::create(page, inspectorClient)) 77 , m_overlay(InspectorOverlay::create(page, inspectorClient))
78 , m_layerTreeAgent(nullptr) 78 , m_layerTreeAgent(nullptr)
79 , m_page(page) 79 , m_page(page)
80 , m_inspectorClient(inspectorClient) 80 , m_inspectorClient(inspectorClient)
81 , m_agents(m_instrumentingAgents.get(), m_state.get()) 81 , m_agents(m_instrumentingAgents.get(), m_state.get())
82 , m_isUnderTest(false) 82 , m_isUnderTest(false)
83 , m_deferredAgentsInitialized(false) 83 , m_deferredAgentsInitialized(false)
84 { 84 {
85 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get() ; 85 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get() ;
86 InspectorOverlay* overlay = m_overlay.get(); 86 InspectorOverlay* overlay = m_overlay.get();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge t(), pageScriptDebugServer); 121 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge t(), pageScriptDebugServer);
122 } 122 }
123 123
124 InspectorController::~InspectorController() 124 InspectorController::~InspectorController()
125 { 125 {
126 } 126 }
127 127
128 void InspectorController::trace(Visitor* visitor) 128 void InspectorController::trace(Visitor* visitor)
129 { 129 {
130 visitor->trace(m_instrumentingAgents); 130 visitor->trace(m_instrumentingAgents);
131 visitor->trace(m_injectedScriptManager);
132 visitor->trace(m_state);
131 visitor->trace(m_domAgent); 133 visitor->trace(m_domAgent);
132 visitor->trace(m_pageAgent); 134 visitor->trace(m_pageAgent);
133 visitor->trace(m_timelineAgent); 135 visitor->trace(m_timelineAgent);
134 visitor->trace(m_layerTreeAgent); 136 visitor->trace(m_layerTreeAgent);
135 visitor->trace(m_tracingAgent); 137 visitor->trace(m_tracingAgent);
136 visitor->trace(m_page); 138 visitor->trace(m_page);
137 m_agents.trace(visitor); 139 m_agents.trace(visitor);
138 #if ENABLE(OILPAN) 140 #if ENABLE(OILPAN)
139 visitor->trace(m_moduleAgents); 141 visitor->trace(m_moduleAgents);
140 #endif 142 #endif
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 m_layerTreeAgent->willAddPageOverlay(layer); 485 m_layerTreeAgent->willAddPageOverlay(layer);
484 } 486 }
485 487
486 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) 488 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer)
487 { 489 {
488 if (m_layerTreeAgent) 490 if (m_layerTreeAgent)
489 m_layerTreeAgent->didRemovePageOverlay(layer); 491 m_layerTreeAgent->didRemovePageOverlay(layer);
490 } 492 }
491 493
492 } // namespace WebCore 494 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698