DevTools: Do not force style sheets update on inspector start.

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 670 matching lines @@
     new EnableResourceClient(this, styleSheetsToFetch, prpCallback);
 }
 
 void InspectorCSSAgent::wasEnabled(PassRefPtr<EnableCallback> callback)
 {
     if (!m_state->getBoolean(CSSAgentState::cssAgentEnabled)) {
         // We were disabled while fetching resources.
         return;
     }
 
-    Vector<InspectorStyleSheet*> styleSheets;
-    collectAllStyleSheets(styleSheets);
-    for (size_t i = 0; i < styleSheets.size(); ++i)
-        m_frontend->styleSheetAdded(styleSheets.at(i)->buildObjectForStyleSheetInfo());
-
-    // More styleSheetAdded events will be generated below.
     m_instrumentingAgents->setInspectorCSSAgent(this);
     Vector<Document*> documents = m_domAgent->documents();
-    for (Vector<Document*>::iterator it = documents.begin(); it != documents.end(); ++it)
-        (*it)->styleEngine()->updateActiveStyleSheets(FullStyleUpdate);
+    for (Vector<Document*>::iterator it = documents.begin(); it != documents.end(); ++it) {
+        Document* document = *it;
+        Vector<CSSStyleSheet*> newSheetsVector;
+        collectAllDocumentStyleSheets(document, newSheetsVector);
+        updateActiveStyleSheets(document, newSheetsVector, true);
+    }
 
     if (callback)
         callback->sendSuccess();
 }
 
 void InspectorCSSAgent::disable(ErrorString*)
 {
     m_instrumentingAgents->setInspectorCSSAgent(0);
     m_state->setBoolean(CSSAgentState::cssAgentEnabled, false);
 }
@@ skipping 112 matching lines @@
     m_frontend->regionOversetChanged(buildObjectForNamedFlow(&errorString, namedFlow, documentNodeId));
 }
 
 void InspectorCSSAgent::activeStyleSheetsUpdated(Document* document)
 {
     if (styleSheetEditInProgress())
         return;
 
     Vector<CSSStyleSheet*> newSheetsVector;
     collectAllDocumentStyleSheets(document, newSheetsVector);
-    updateActiveStyleSheets(document, newSheetsVector);
+    updateActiveStyleSheets(document, newSheetsVector, false);
 }
 
-void InspectorCSSAgent::updateActiveStyleSheets(Document* document, const Vector<CSSStyleSheet*>& allSheetsVector)
+void InspectorCSSAgent::updateActiveStyleSheets(Document* document, const Vector<CSSStyleSheet*>& allSheetsVector, bool initial)

[lushnikov, 2013/12/27 08:20:17]

nit: consider using default value

bool initial = false)

[apavlov, 2013/12/27 08:27:40]

Default argument values are disproved in Blink, according to pfeldman.

 {
     HashSet<CSSStyleSheet*> removedSheets;
     for (CSSStyleSheetToInspectorStyleSheet::iterator it = m_cssStyleSheetToInspectorStyleSheet.begin(); it != m_cssStyleSheetToInspectorStyleSheet.end(); ++it) {
         if (it->value->canBind() && (!it->key->ownerDocument() || it->key->ownerDocument() == document))
             removedSheets.add(it->key);
     }
 
     HashSet<CSSStyleSheet*> addedSheets;
     for (Vector<CSSStyleSheet*>::const_iterator it = allSheetsVector.begin(); it != allSheetsVector.end(); ++it) {
         CSSStyleSheet* cssStyleSheet = *it;
-        if (removedSheets.contains(cssStyleSheet))
+        if (removedSheets.contains(cssStyleSheet)) {
             removedSheets.remove(cssStyleSheet);
-        else
+            if (initial)
+                addedSheets.add(cssStyleSheet);
+        } else {
             addedSheets.add(cssStyleSheet);
+        }
     }
 
     for (HashSet<CSSStyleSheet*>::iterator it = removedSheets.begin(); it != removedSheets.end(); ++it) {
         RefPtr<InspectorStyleSheet> inspectorStyleSheet = m_cssStyleSheetToInspectorStyleSheet.get(*it);
         ASSERT(inspectorStyleSheet);
         if (m_idToInspectorStyleSheet.contains(inspectorStyleSheet->id())) {
             String id = unbindStyleSheet(inspectorStyleSheet.get());
-            if (m_frontend)
+            if (m_frontend && !initial)
                 m_frontend->styleSheetRemoved(id);
         }
     }
 
     for (HashSet<CSSStyleSheet*>::iterator it = addedSheets.begin(); it != addedSheets.end(); ++it) {
-        if (!m_cssStyleSheetToInspectorStyleSheet.contains(*it)) {
+        bool isNew = initial || !m_cssStyleSheetToInspectorStyleSheet.contains(*it);

[apavlov, 2013/12/27 07:12:30]

The var name does not seem to fully reflect the idea behind it. It's rather
"shouldAdd" or something similar (that is, the stylesheet might not be new, but
should be added to the frontend and, optionally, to the backend (if it's really
new)).

+        if (isNew) {
             InspectorStyleSheet* newStyleSheet = bindStyleSheet(*it);
             if (m_frontend)
                 m_frontend->styleSheetAdded(newStyleSheet->buildObjectForStyleSheetInfo());
         }
     }
 }
 
 void InspectorCSSAgent::frameDetachedFromParent(Frame* frame)
 {
     Document* document = frame->document();
     if (!document)
         return;
     const Vector<CSSStyleSheet*> styleSheets;
-    updateActiveStyleSheets(document, styleSheets);
+    updateActiveStyleSheets(document, styleSheets, false);
 }
 
 bool InspectorCSSAgent::forcePseudoState(Element* element, CSSSelector::PseudoType pseudoType)
 {
     if (m_nodeIdToForcedPseudoState.isEmpty())
         return false;
 
     int nodeId = m_domAgent->boundNodeId(element);
     if (!nodeId)
         return false;
@@ skipping 861 matching lines @@
             documentsToChange.add(element->ownerDocument());
     }
 
     m_nodeIdToForcedPseudoState.clear();
     for (HashSet<Document*>::iterator it = documentsToChange.begin(), end = documentsToChange.end(); it != end; ++it)
         (*it)->setNeedsStyleRecalc();
 }
 
 } // namespace WebCore