Changeset 34740 in webkit

Timestamp:

Jun 23, 2008 10:33:49 AM (16 years ago)

Author:

timothy@apple.com

Message:

Make profiles of the same name in the Inspector group in the
sidebar under a collapsable item that contains all the runs.

​https://bugs.webkit.org/show_bug.cgi?id=19713

Reviewed by Darin Adler.

• English.lproj/localizedStrings.js: New strings.
• page/inspector/Images/profileGroupIcon.png: Added.
• page/inspector/Images/profileSmallIcon.png: Added.
• page/inspector/ProfilesPanel.js: (WebInspector.ProfilesPanel.prototype.reset): Clear _profileGroups. Remove the "some-expandable" class from the sidebarTree. (WebInspector.ProfilesPanel.prototype.addProfile): Append new profiles that have the same name as a previous profile into a group. When a group has 2 profiles a ProfileGroupSidebarTreeElement is made and the ProfileSidebarTreeElements are appended to the group's element. (WebInspector.ProfileSidebarTreeElement.prototype.get mainTitle): Return _mainTitle is it is set. (WebInspector.ProfileSidebarTreeElement.prototype.set mainTitle): Set _mainTitle which is an override title. (WebInspector.ProfileGroupSidebarTreeElement): Inherit SidebarTreeElement. (WebInspector.ProfileGroupSidebarTreeElement.prototype.onselect): Show the last profile in the group when selected.
• page/inspector/SidebarTreeElement.js: (WebInspector.SidebarTreeElement.prototype.get small): Return _small. (WebInspector.SidebarTreeElement.prototype.set small): Set _small and update the style to match. (WebInspector.SidebarTreeElement.prototype.onattach): Set the small class if the small property is true.
• page/inspector/inspector.css: New styles for profiles groups and for the small profiles.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• English.lproj/localizedStrings.js (modified) (previous)
• page/inspector/Images/profileGroupIcon.png (added)
• page/inspector/Images/profileSmallIcon.png (added)
• page/inspector/ProfilesPanel.js (modified) (5 diffs)
• page/inspector/SidebarTreeElement.js (modified) (2 diffs)
• page/inspector/inspector.css (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-06-23  Timothy Hatcher  <timothy@apple.com>
+
+        Make profiles of the same name in the Inspector group in the
+        sidebar under a collapsable item that contains all the runs.
+
+        https://bugs.webkit.org/show_bug.cgi?id=19713
+
+        Reviewed by Darin Adler.
+
+        * English.lproj/localizedStrings.js: New strings.
+        * page/inspector/Images/profileGroupIcon.png: Added.
+        * page/inspector/Images/profileSmallIcon.png: Added.
+        * page/inspector/ProfilesPanel.js:
+        (WebInspector.ProfilesPanel.prototype.reset): Clear _profileGroups.
+        Remove the "some-expandable" class from the sidebarTree.
+        (WebInspector.ProfilesPanel.prototype.addProfile): Append new profiles
+        that have the same name as a previous profile into a group. When a
+        group has 2 profiles a ProfileGroupSidebarTreeElement is made and the
+        ProfileSidebarTreeElements are appended to the group's element. 
+        (WebInspector.ProfileSidebarTreeElement.prototype.get mainTitle):
+        Return _mainTitle is it is set.
+        (WebInspector.ProfileSidebarTreeElement.prototype.set mainTitle):
+        Set _mainTitle which is an override title.
+        (WebInspector.ProfileGroupSidebarTreeElement): Inherit SidebarTreeElement.
+        (WebInspector.ProfileGroupSidebarTreeElement.prototype.onselect):
+        Show the last profile in the group when selected.
+        * page/inspector/SidebarTreeElement.js:
+        (WebInspector.SidebarTreeElement.prototype.get small): Return _small.
+        (WebInspector.SidebarTreeElement.prototype.set small): Set _small and
+        update the style to match.
+        (WebInspector.SidebarTreeElement.prototype.onattach): Set the small
+        class if the small property is true.
+        * page/inspector/inspector.css: New styles for profiles groups
+        and for the small profiles.
+
 2008-06-23  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/page/inspector/ProfilesPanel.js

@@ -106 +106 @@
 
         this._profiles = [];
+        this._profileGroups = {};
+
+        this.sidebarTreeElement.removeStyleClass("some-expandable");
 
         this.sidebarTree.removeChildren();
@@ -122 +125 @@
         this._profiles.push(profile);
 
+        var sidebarParent = this.sidebarTree;
+        var small = false;
+        var alternateTitle;
+
+        if (profile.title !== "org.webkit.profiles.user-initiated") {
+            if (!(profile.title in this._profileGroups))
+                this._profileGroups[profile.title] = [];
+
+            var group = this._profileGroups[profile.title];
+            group.push(profile);
+
+            if (group.length === 2) {
+                // Make a group TreeElement now that there are 2 profiles.
+                group._profilesTreeElement = new WebInspector.ProfileGroupSidebarTreeElement(profile.title);
+
+                // Insert at the same index for the first profile of the group.
+                var index = this.sidebarTree.children.indexOf(group[0]._profilesTreeElement);
+                this.sidebarTree.insertChild(group._profilesTreeElement, index);
+
+                // Move the first profile to the group.
+                var selected = group[0]._profilesTreeElement.selected;
+                this.sidebarTree.removeChild(group[0]._profilesTreeElement);
+                group._profilesTreeElement.appendChild(group[0]._profilesTreeElement);
+                if (selected) {
+                    group[0]._profilesTreeElement.select();
+                    group[0]._profilesTreeElement.reveal();
+                }
+
+                group[0]._profilesTreeElement.small = true;
+                group[0]._profilesTreeElement.mainTitle = WebInspector.UIString("Run %d", 1);
+
+                this.sidebarTreeElement.addStyleClass("some-expandable");
+            }
+
+            if (group.length >= 2) {
+                sidebarParent = group._profilesTreeElement;
+                alternateTitle = WebInspector.UIString("Run %d", group.length);
+                small = true;
+            }
+        }
+
         var profileTreeElement = new WebInspector.ProfileSidebarTreeElement(profile);
+        profileTreeElement.small = small;
+        if (alternateTitle)
+            profileTreeElement.mainTitle = alternateTitle;
         profile._profilesTreeElement = profileTreeElement;
 
-        this.sidebarTree.appendChild(profileTreeElement);
+        sidebarParent.appendChild(profileTreeElement);
     },
 
@@ -256 +303 @@
     get mainTitle()
     {
+        if (this._mainTitle)
+            return this._mainTitle;
         if (this.profile.title === "org.webkit.profiles.user-initiated")
             return WebInspector.UIString("Profile %d", this._profileNumber);
@@ -263 +312 @@
     set mainTitle(x)
     {
-        // Can't change mainTitle.
+        this._mainTitle = x;
+        this.refreshTitles();
     },
 
@@ -278 +328 @@
 
 WebInspector.ProfileSidebarTreeElement.prototype.__proto__ = WebInspector.SidebarTreeElement.prototype;
+
+WebInspector.ProfileGroupSidebarTreeElement = function(title, subtitle)
+{
+    WebInspector.SidebarTreeElement.call(this, "profile-group-sidebar-tree-item", title, subtitle, null, true);
+}
+
+WebInspector.ProfileGroupSidebarTreeElement.prototype = {
+    onselect: function()
+    {
+        WebInspector.panels.profiles.showProfile(this.children[this.children.length - 1].profile);
+    }
+}
+
+WebInspector.ProfileGroupSidebarTreeElement.prototype.__proto__ = WebInspector.SidebarTreeElement.prototype;

trunk/WebCore/page/inspector/SidebarTreeElement.js

@@ -98 +98 @@
 
 WebInspector.SidebarTreeElement.prototype = {
+    get small()
+    {
+        return this._small;
+    },
+
+    set small(x)
+    {
+        this._small = x;
+
+        if (this._listItemNode) {
+            if (this._small)
+                this._listItemNode.addStyleClass("small");
+            else
+                this._listItemNode.removeStyleClass("small");
+        }
+    },
+
     get mainTitle()
     {
@@ -164 +181 @@
             this._listItemNode.addStyleClass(this.className);
 
+        if (this.small)
+            this._listItemNode.addStyleClass("small");
+
         if (this.hasChildren && this.disclosureButton)
             this._listItemNode.appendChild(this.disclosureButton);

trunk/WebCore/page/inspector/inspector.css

@@ -2487 +2487 @@
 }
 
+.profile-sidebar-tree-item.small .icon {
+    content: url(Images/profileSmallIcon.png);
+}
+
+.profile-group-sidebar-tree-item .icon {
+    content: url(Images/profileGroupIcon.png);
+}
+
 .profile-view {
     display: none;