Changeset 159777 in webkit

Timestamp:

Nov 25, 2013 6:21:04 PM (10 years ago)

Author:

Alexandru Chiculita

Message:

Web Inspector: [CSS Regions] A page with many flows should collapse the resources tree
​https://bugs.webkit.org/show_bug.cgi?id=122926

Reviewed by Timothy Hatcher.

Refactored the code in FrameTreeElement._shouldGroupIntoFolders to make it easy to track
more types of resources. Added the content flows as another type of resource that would trigger the
collapsing.

• UserInterface/DOMTreeManager.js:

(WebInspector.DOMTreeManager.prototype.namedFlowRemoved): Added code to remove the content nodes from
a flow that has been removed.

• UserInterface/FrameTreeElement.js:

(WebInspector.FrameTreeElement.prototype._shouldGroupIntoFolders.pushCategory):
(WebInspector.FrameTreeElement.prototype._shouldGroupIntoFolders.pushResourceType):
(WebInspector.FrameTreeElement.prototype._shouldGroupIntoFolders):

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/DOMTreeManager.js (modified) (1 diff)
• UserInterface/FrameTreeElement.js (modified) (3 diffs)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2013-11-25  Alexandru Chiculita  <achicu@adobe.com>
+
+        Web Inspector: [CSS Regions] A page with many flows should collapse the resources tree
+        https://bugs.webkit.org/show_bug.cgi?id=122926
+
+        Reviewed by Timothy Hatcher.
+
+        Refactored the code in FrameTreeElement._shouldGroupIntoFolders to make it easy to track
+        more types of resources. Added the content flows as another type of resource that would trigger the
+        collapsing.
+
+        * UserInterface/DOMTreeManager.js:
+        (WebInspector.DOMTreeManager.prototype.namedFlowRemoved): Added code to remove the content nodes from
+        a flow that has been removed.
+        * UserInterface/FrameTreeElement.js:
+        (WebInspector.FrameTreeElement.prototype._shouldGroupIntoFolders.pushCategory):
+        (WebInspector.FrameTreeElement.prototype._shouldGroupIntoFolders.pushResourceType):
+        (WebInspector.FrameTreeElement.prototype._shouldGroupIntoFolders):
+
 2013-11-25  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/DOMTreeManager.js

@@ -602 +602 @@
         console.assert(contentFlow);
         this._flows.delete(flowKey);
+
+        // Remove any back links to this flow from the content nodes.
+        for (var contentNode of contentFlow.contentNodes)
+            this._contentNodesToFlowsMap.delete(contentNode.id);
+
         this.dispatchEventToListeners(WebInspector.DOMTreeManager.Event.ContentFlowWasRemoved, {flow: contentFlow});
     },

trunk/Source/WebInspectorUI/UserInterface/FrameTreeElement.js

@@ -434 +434 @@
             return a.mainTitle.localeCompare(b.mainTitle);
         }
-        
+
         // Non-resources should appear before the resources.
         // FIXME: There should be a better way to group the elements by their type.
@@ -537 +537 @@
         var numberOfMediumCategories = 0;
         var foundLargeCategory = false;
-
-        // FIXME: Use this._frame.domTree.flowsCount to count the number of flows in a frame.
-        // https://bugs.webkit.org/show_bug.cgi?id=122926
-
-        if (this._frame.childFrames.length >= WebInspector.FrameTreeElement.LargeChildCountThreshold)
-            foundLargeCategory = true;
-        else if (this._frame.childFrames.length >= WebInspector.FrameTreeElement.MediumChildCountThreshold)
-            ++numberOfMediumCategories;
-        else if (this._frame.childFrames.length)
-            ++numberOfSmallCategories;
-
-        // Iterate over all the available resource types. There are some other properties on
-        // WebInspector.Resource.Type that we need to skip, like private data and functions.
-        for (var type in WebInspector.Resource.Type) {
-            // Skip private data.
+        var frame = this._frame;
+
+        function pushResourceType(type) {
+            // There are some other properties on WebInspector.Resource.Type that we need to skip, like private data and functions
             if (type.charAt(0) === "_")
-                continue;
+                return false;
 
             // Only care about the values that are strings, not functions, etc.
             var typeValue = WebInspector.Resource.Type[type];
             if (typeof typeValue !== "string")
-                continue;
-
-            var resourceCount = this._frame.resourcesWithType(typeValue).length;
+                return false;
+
+            return pushCategory(frame.resourcesWithType(typeValue).length);
+        }
+
+        function pushCategory(resourceCount)
+        {
             if (!resourceCount)
-                continue;
+                return false;
 
             // If this type has any resources and there is a known large category, make folders.
-            if (resourceCount && foundLargeCategory)
+            if (foundLargeCategory)
                 return true;
 
@@ -575 +568 @@
 
                 foundLargeCategory = true;
-                continue;
+                return false;
             }
 
             // Check if this is a medium category.
             if (resourceCount >= WebInspector.FrameTreeElement.MediumChildCountThreshold) {
-                ++numberOfMediumCategories;
-
                 // If this is the medium category that puts us over the maximum allowed, make folders.
-                if (numberOfMediumCategories >= WebInspector.FrameTreeElement.NumberOfMediumCategoriesThreshold)
-                    return true;
-                continue;
+                return ++numberOfMediumCategories >= WebInspector.FrameTreeElement.NumberOfMediumCategoriesThreshold;
             }
 
             // This is a small category.
             ++numberOfSmallCategories;
-        }
-
-        return false;
+            return false;
+        }
+
+        // Iterate over all the available resource types.
+        return pushCategory(frame.childFrames.length) || pushCategory(frame.domTree.flowsCount) || Object.keys(WebInspector.Resource.Type).some(pushResourceType);
     },