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

Unified Diff: Source/core/frame/LocalFrame.cpp

Issue 898593002: DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed assertion Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/inspector/InspectorApplicationCacheAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index 1263f0e3139fcb3403fa7b9d868851e269c3f4b6..fb5dd2a855cae8baf0b8abe045b4f2212be63773 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -51,6 +51,7 @@
#include "core/html/HTMLPlugInElement.h"
#include "core/inspector/ConsoleMessageStorage.h"
#include "core/inspector/InspectorInstrumentation.h"
+#include "core/inspector/InstrumentingAgents.h"
#include "core/layout/HitTestResult.h"
#include "core/layout/compositing/RenderLayerCompositor.h"
#include "core/loader/FrameLoaderClient.h"
@@ -221,6 +222,7 @@ LocalFrame::~LocalFrame()
void LocalFrame::trace(Visitor* visitor)
{
+ visitor->trace(m_instrumentingAgents);
#if ENABLE(OILPAN)
visitor->trace(m_destructionObservers);
visitor->trace(m_loader);
@@ -424,6 +426,16 @@ LocalFrame* LocalFrame::localFrameRoot()
return curFrame;
}
+InstrumentingAgents* LocalFrame::instrumentingAgents()
+{
+ return m_instrumentingAgents.get();
+}
+
+void LocalFrame::setInstrumentingAgents(InstrumentingAgents* instrumentingAgents)
+{
+ m_instrumentingAgents = instrumentingAgents;
+}
+
bool LocalFrame::inScope(TreeScope* scope) const
{
ASSERT(scope);
@@ -815,6 +827,7 @@ inline LocalFrame::LocalFrame(FrameLoaderClient* client, FrameHost* host, FrameO
, m_pageZoomFactor(parentPageZoomFactor(this))
, m_textZoomFactor(parentTextZoomFactor(this))
, m_inViewSourceMode(false)
+ , m_instrumentingAgents(host->instrumentingAgents())
{
}
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/inspector/InspectorApplicationCacheAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698