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

Unified Diff: Source/core/inspector/InspectorInstrumentation.cpp

Issue 14916006: Merge 149874 "DevTools: Do not unbind stylesheets in multiframe ..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1500/
Patch Set: Created 7 years, 7 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/inspector/InspectorCSSAgent.cpp ('k') | Source/core/inspector/InspectorInstrumentationInl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorInstrumentation.cpp
===================================================================
--- Source/core/inspector/InspectorInstrumentation.cpp (revision 150193)
+++ Source/core/inspector/InspectorInstrumentation.cpp (working copy)
@@ -216,10 +216,10 @@
domDebuggerAgent->didInvalidateStyleAttr(node);
}
-void activeStyleSheetsUpdatedImpl(InstrumentingAgents* instrumentingAgents, const Vector<RefPtr<StyleSheet> >& newSheets)
+void activeStyleSheetsUpdatedImpl(InstrumentingAgents* instrumentingAgents, Document* document, const Vector<RefPtr<StyleSheet> >& newSheets)
{
if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
- cssAgent->activeStyleSheetsUpdated(newSheets);
+ cssAgent->activeStyleSheetsUpdated(document, newSheets);
}
void frameWindowDiscardedImpl(InstrumentingAgents* instrumentingAgents, DOMWindow* window)
@@ -849,6 +849,8 @@
canvasAgent->frameDetachedFromParent(frame);
if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent())
pageAgent->frameDetachedFromParent(frame);
+ if (InspectorCSSAgent* cssAgent = instrumentingAgents->inspectorCSSAgent())
+ cssAgent->frameDetachedFromParent(frame);
}
void didCommitLoadImpl(InstrumentingAgents* instrumentingAgents, Frame* frame, DocumentLoader* loader)
« no previous file with comments | « Source/core/inspector/InspectorCSSAgent.cpp ('k') | Source/core/inspector/InspectorInstrumentationInl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698