Merge 149874 "DevTools: Do not unbind stylesheets in multiframe ..."

Source/core/inspector/InspectorInstrumentation.cpp

 /*
 * Copyright (C) 2011 Google Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are
 * met:
 *
 *     * Redistributions of source code must retain the above copyright
 * notice, this list of conditions and the following disclaimer.
 *     * Redistributions in binary form must reproduce the above
@@ skipping 198 matching lines @@
 }
 
 void didInvalidateStyleAttrImpl(InstrumentingAgents* instrumentingAgents, Node* node)
 {
     if (InspectorDOMAgent* domAgent = instrumentingAgents->inspectorDOMAgent())
         domAgent->didInvalidateStyleAttr(node);
     if (InspectorDOMDebuggerAgent* domDebuggerAgent = instrumentingAgents->inspectorDOMDebuggerAgent())
         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)
 {
     if (InspectorConsoleAgent* consoleAgent = instrumentingAgents->inspectorConsoleAgent())
         consoleAgent->frameWindowDiscarded(window);
 }
 
 void mediaQueryResultChangedImpl(InstrumentingAgents* instrumentingAgents)
 {
@@ skipping 609 matching lines @@
     if (InspectorPageAgent* pageAgent = instrumentingAgents->inspectorPageAgent())
         pageAgent->loadEventFired();
 }
 
 void frameDetachedFromParentImpl(InstrumentingAgents* instrumentingAgents, Frame* frame)
 {
     if (InspectorCanvasAgent* canvasAgent = instrumentingAgents->inspectorCanvasAgent())
         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)
 {
     InspectorAgent* inspectorAgent = instrumentingAgents->inspectorAgent();
     if (!inspectorAgent)
         return;
 
     Frame* mainFrame = frame->page()->mainFrame();
     if (loader->frame() == mainFrame) {
@@ skipping 457 matching lines @@
 const char BeginFrame[] = "BeginFrame";
 };
 
 namespace InstrumentationEventArguments {
 const char LayerId[] = "layerId";
 const char PageId[] = "pageId";
 };
 
 } // namespace WebCore