Revert 169371 "DevTools: defer styles delta calculation to until..."

trunk/Source/core/inspector/InspectorCSSAgent.cpp

 /*
  * Copyright (C) 2010, 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 413 matching lines @@
     m_domAgent->setDOMListener(0);
     m_domAgent = 0;
 }
 
 void InspectorCSSAgent::restore()
 {
     if (m_state->getBoolean(CSSAgentState::cssAgentEnabled))
         wasEnabled(nullptr);
 }
 
-void InspectorCSSAgent::flushPendingFrontendMessages()
-{
-    if (!m_invalidatedDocuments.size())
-        return;
-    HashSet<Document*> invalidatedDocuments;
-    m_invalidatedDocuments.swap(&invalidatedDocuments);
-    for (HashSet<Document*>::iterator it = invalidatedDocuments.begin(); it != invalidatedDocuments.end(); ++it)
-        updateActiveStyleSheets(*it, ExistingFrontendRefresh);
-}
-
 void InspectorCSSAgent::reset()
 {
     m_idToInspectorStyleSheet.clear();
     m_cssStyleSheetToInspectorStyleSheet.clear();
     m_documentToCSSStyleSheets.clear();
-    m_invalidatedDocuments.clear();
     m_nodeToInspectorStyleSheet.clear();
     m_documentToViaInspectorStyleSheet.clear();
     resetNonPersistentData();
 }
 
 void InspectorCSSAgent::resetNonPersistentData()
 {
     resetPseudoStates();
 }
 
@@ skipping 63 matching lines @@
 
     for (DocumentStyleSheets::iterator it = m_documentToCSSStyleSheets.begin(); it != m_documentToCSSStyleSheets.end(); ++it) {
         Document* document = it->key;
         if (!document->frame() || document->frame() == frame)
             documentDisposed(document);
     }
 }
 
 void InspectorCSSAgent::mediaQueryResultChanged()
 {
-    flushPendingFrontendMessages();
-    m_frontend->mediaQueryResultChanged();
+    if (m_frontend)
+        m_frontend->mediaQueryResultChanged();
 }
 
 void InspectorCSSAgent::willMutateRules()
 {
     ++m_styleSheetsPendingMutation;
 }
 
 void InspectorCSSAgent::didMutateRules(CSSStyleSheet* styleSheet)
 {
     --m_styleSheetsPendingMutation;
@@ skipping 20 matching lines @@
         Document* owner = parentSheet ? parentSheet->ownerDocument() : 0;
         if (owner)
             owner->modifiedStyleSheet(parentSheet, RecalcStyleDeferred, FullStyleUpdate);
     }
 }
 
 void InspectorCSSAgent::activeStyleSheetsUpdated(Document* document)
 {
     if (styleSheetEditInProgress())
         return;
-    m_invalidatedDocuments.add(document);
-    if (m_creatingViaInspectorStyleSheet)
-        flushPendingFrontendMessages();
+    updateActiveStyleSheets(document, ExistingFrontendRefresh);
 }
 
 void InspectorCSSAgent::updateActiveStyleSheets(Document* document, StyleSheetsUpdateType styleSheetsUpdateType)
 {
     Vector<CSSStyleSheet*> newSheetsVector;
     collectAllDocumentStyleSheets(document, newSheetsVector);
     setActiveStyleSheets(document, newSheetsVector, styleSheetsUpdateType);
 }
 
 void InspectorCSSAgent::setActiveStyleSheets(Document* document, const Vector<CSSStyleSheet*>& allSheetsVector, StyleSheetsUpdateType styleSheetsUpdateType)
@@ skipping 46 matching lines @@
                 m_frontend->styleSheetAdded(newStyleSheet->buildObjectForStyleSheetInfo());
         }
     }
 
     if (documentCSSStyleSheets->isEmpty())
         m_documentToCSSStyleSheets.remove(document);
 }
 
 void InspectorCSSAgent::documentDisposed(Document* document)
 {
-    m_invalidatedDocuments.remove(document);
     setActiveStyleSheets(document, Vector<CSSStyleSheet*>(), ExistingFrontendRefresh);
 }
 
 void InspectorCSSAgent::frameDetachedFromParent(LocalFrame* frame)
 {
     documentDisposed(frame->document());
 }
 
 bool InspectorCSSAgent::forcePseudoState(Element* element, CSSSelector::PseudoType pseudoType)
 {
@@ skipping 248 matching lines @@
         *errorString = "Frame does not have a document";
         return;
     }
 
     InspectorStyleSheet* inspectorStyleSheet = viaInspectorStyleSheet(document, true);
     if (!inspectorStyleSheet) {
         *errorString = "No target stylesheet found";
         return;
     }
 
-    updateActiveStyleSheets(document, ExistingFrontendRefresh);
-
     *outStyleSheetId = inspectorStyleSheet->id();
 }
 
 void InspectorCSSAgent::addRule(ErrorString* errorString, const String& styleSheetId, const String& selector, RefPtr<TypeBuilder::CSS::CSSRule>& result)
 {
     InspectorStyleSheet* inspectorStyleSheet = assertStyleSheetForId(errorString, styleSheetId);
     if (!inspectorStyleSheet)
         return;
 
     TrackExceptionState exceptionState;
@@ skipping 400 matching lines @@
 
     NodeToInspectorStyleSheet::iterator it = m_nodeToInspectorStyleSheet.find(element);
     if (it == m_nodeToInspectorStyleSheet.end())
         return;
 
     it->value->didModifyElementAttribute();
 }
 
 void InspectorCSSAgent::styleSheetChanged(InspectorStyleSheet* styleSheet)
 {
-    flushPendingFrontendMessages();
-    m_frontend->styleSheetChanged(styleSheet->id());
+    if (m_frontend)
+        m_frontend->styleSheetChanged(styleSheet->id());
 }
 
 void InspectorCSSAgent::willReparseStyleSheet()
 {
     ASSERT(!m_isSettingStyleSheetText);
     m_isSettingStyleSheetText = true;
 }
 
 void InspectorCSSAgent::didReparseStyleSheet()
 {
@@ skipping 10 matching lines @@
             documentsToChange.add(element->ownerDocument());
     }
 
     m_nodeIdToForcedPseudoState.clear();
     for (HashSet<Document*>::iterator it = documentsToChange.begin(), end = documentsToChange.end(); it != end; ++it)
         (*it)->setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 } // namespace WebCore