Changeset 208441 in webkit

Timestamp:

Nov 9, 2016 10:25:30 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Allow FolderTreeElement to display content when selected
​https://bugs.webkit.org/show_bug.cgi?id=164407

Patch by Devin Rousso <Devin Rousso> on 2016-11-09
Reviewed by Timothy Hatcher.

• UserInterface/Main.html:

Add CollectionContentView and TitleView.

• UserInterface/Base/Main.js:
• UserInterface/Views/ContentView.js:

(WebInspector.ContentView.createFromRepresentedObject):
(WebInspector.ContentView.isViewable):
Add support for Collection as the representedObject of a content view.

• UserInterface/Views/CollectionContentView.css: Added.

(.content-view.collection):
(.content-view.collection > .content-view):

• UserInterface/Views/CollectionContentView.js: Added.

(WebInspector.CollectionContentView):
(WebInspector.CollectionContentView.prototype.initialLayout):
(WebInspector.CollectionContentView.prototype._addContentViewForItem):
(WebInspector.CollectionContentView.prototype._removeContentViewForItem):
(WebInspector.CollectionContentView.prototype._handleItemAdded):
(WebInspector.CollectionContentView.prototype._handleItemRemoved):
(WebInspector.CollectionContentView.prototype._handleContentError):
Takes in a Collection when constructed, and attempts to display a sub-ContentView for each
item in the collection if the type of the collection is viewable en masse. Currently, this
is only supported for WebInspector.Resource.Type.Image collections.

• UserInterface/Views/ResourceContentView.js:

(WebInspector.ResourceContentView.prototype._contentError):
Dispatch an event whenever the content fails to load.

• UserInterface/Views/ResourceSidebarPanel.js:

(WebInspector.ResourceSidebarPanel.prototype._treeSelectionDidChange):

• UserInterface/Views/ResourcesTabContentView.js:

(WebInspector.ResourcesTabContentView.prototype.canShowRepresentedObject):
Allow FolderTreeElements to be selected.

• UserInterface/Views/TitleView.css: Added.

(.title-view):

• UserInterface/Views/TitleView.js: Added.

(WebInspector.TitleView):
Basic view that displays the given text in the center of the viewable area.

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Base/Main.js (modified) (1 diff)
• UserInterface/Main.html (modified) (4 diffs)
• UserInterface/Views/CollectionContentView.css (added)
• UserInterface/Views/CollectionContentView.js (added)
• UserInterface/Views/ContentView.js (modified) (2 diffs)
• UserInterface/Views/ResourceContentView.js (modified) (2 diffs)
• UserInterface/Views/ResourceSidebarPanel.js (modified) (2 diffs)
• UserInterface/Views/ResourcesTabContentView.js (modified) (1 diff)
• UserInterface/Views/TitleView.css (added)
• UserInterface/Views/TitleView.js (added)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-11-09  Devin Rousso  <dcrousso+webkit@gmail.com>
+
+        Web Inspector: Allow FolderTreeElement to display content when selected
+        https://bugs.webkit.org/show_bug.cgi?id=164407
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Main.html:
+        Add CollectionContentView and TitleView.
+
+        * UserInterface/Base/Main.js:
+        * UserInterface/Views/ContentView.js:
+        (WebInspector.ContentView.createFromRepresentedObject):
+        (WebInspector.ContentView.isViewable):
+        Add support for Collection as the representedObject of a content view.
+
+        * UserInterface/Views/CollectionContentView.css: Added.
+        (.content-view.collection):
+        (.content-view.collection > .content-view):
+        * UserInterface/Views/CollectionContentView.js: Added.
+        (WebInspector.CollectionContentView):
+        (WebInspector.CollectionContentView.prototype.initialLayout):
+        (WebInspector.CollectionContentView.prototype._addContentViewForItem):
+        (WebInspector.CollectionContentView.prototype._removeContentViewForItem):
+        (WebInspector.CollectionContentView.prototype._handleItemAdded):
+        (WebInspector.CollectionContentView.prototype._handleItemRemoved):
+        (WebInspector.CollectionContentView.prototype._handleContentError):
+        Takes in a Collection when constructed, and attempts to display a sub-ContentView for each
+        item in the collection if the type of the collection is viewable en masse.  Currently, this
+        is only supported for WebInspector.Resource.Type.Image collections.
+
+        * UserInterface/Views/ResourceContentView.js:
+        (WebInspector.ResourceContentView.prototype._contentError):
+        Dispatch an event whenever the content fails to load.
+
+        * UserInterface/Views/ResourceSidebarPanel.js:
+        (WebInspector.ResourceSidebarPanel.prototype._treeSelectionDidChange):
+        * UserInterface/Views/ResourcesTabContentView.js:
+        (WebInspector.ResourcesTabContentView.prototype.canShowRepresentedObject):
+        Allow FolderTreeElements to be selected.
+
+        * UserInterface/Views/TitleView.css: Added.
+        (.title-view):
+        * UserInterface/Views/TitleView.js: Added.
+        (WebInspector.TitleView):
+        Basic view that displays the given text in the center of the viewable area.
+
 2016-11-03  Nikita Vasilyev  <nvasilyev@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Main.js

@@ -1111 +1111 @@
         return WebInspector.ResourcesTabContentView;
 
+    if (representedObject instanceof WebInspector.Collection)
+        return WebInspector.CollectionContentView;
+
     return null;
 };

trunk/Source/WebInspectorUI/UserInterface/Main.html

@@ -50 +50 @@
     <link rel="stylesheet" href="Views/ClusterContentView.css">
     <link rel="stylesheet" href="Views/CodeMirrorOverrides.css">
+    <link rel="stylesheet" href="Views/CollectionContentView.css">
     <link rel="stylesheet" href="Views/ColorPicker.css">
     <link rel="stylesheet" href="Views/ColorWheel.css">
@@ -176 +177 @@
     <link rel="stylesheet" href="Views/TimelineTabContentView.css">
     <link rel="stylesheet" href="Views/TimelineView.css">
+    <link rel="stylesheet" href="Views/TitleView.css">
     <link rel="stylesheet" href="Views/Toolbar.css">
     <link rel="stylesheet" href="Views/TreeElementStatusButton.css">
@@ -490 +492 @@
     <script src="Views/CodeMirrorFormatters.js"></script>
     <script src="Views/CodeMirrorTextMarkers.js"></script>
+    <script src="Views/CollectionContentView.js"></script>
     <script src="Views/ColorPicker.js"></script>
     <script src="Views/ColorWheel.js"></script>
@@ -653 +656 @@
     <script src="Views/TimelineRecordingProgressView.js"></script>
     <script src="Views/TimelineRuler.js"></script>
+    <script src="Views/TitleView.js"></script>
     <script src="Views/ToggleButtonNavigationItem.js"></script>
     <script src="Views/TextToggleButtonNavigationItem.js"></script>

trunk/Source/WebInspectorUI/UserInterface/Views/ContentView.js

@@ -142 +142 @@
             return new WebInspector.HeapSnapshotClusterContentView(representedObject, extraArguments);
 
+        if (representedObject instanceof WebInspector.Collection)
+            return new WebInspector.CollectionContentView(representedObject, extraArguments);
+
         if (typeof representedObject === "string" || representedObject instanceof String)
             return new WebInspector.TextContentView(representedObject, extraArguments);
@@ -244 +247 @@
             return true;
         if (representedObject instanceof WebInspector.HeapSnapshotProxy || representedObject instanceof WebInspector.HeapSnapshotDiffProxy)
+            return true;
+        if (representedObject instanceof WebInspector.Collection)
             return true;
         if (typeof representedObject === "string" || representedObject instanceof String)

trunk/Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js

@@ -105 +105 @@
         this.element.removeChildren();
         this.element.appendChild(WebInspector.createMessageTextView(error, true));
+
+        this.dispatchEventToListeners(WebInspector.ResourceContentView.Event.ContentError);
     }
 
@@ -133 +135 @@
     }
 };
+
+WebInspector.ResourceContentView.Event = {
+    ContentError: "resource-content-view-content-error",
+};

trunk/Source/WebInspectorUI/UserInterface/Views/ResourceSidebarPanel.js

@@ -114 +114 @@
         // A custom implementation is needed for this since the frames are populated lazily.
 
-        if (!this._mainFrameTreeElement && (representedObject instanceof WebInspector.Resource || representedObject instanceof WebInspector.Frame)) {
+        if (!this._mainFrameTreeElement && (representedObject instanceof WebInspector.Resource || representedObject instanceof WebInspector.Frame || representedObject instanceof WebInspector.Collection)) {
             // All resources are under the main frame, so we need to return early if we don't have the main frame yet.
             return null;
@@ -441 +441 @@
     {
         let treeElement = event.data.selectedElement;
-        if (!treeElement || treeElement instanceof WebInspector.FolderTreeElement)
-            return;
-
-        if (treeElement instanceof WebInspector.ResourceTreeElement
+        if (!treeElement)
+            return;
+
+        if (treeElement instanceof WebInspector.FolderTreeElement
+            || treeElement instanceof WebInspector.ResourceTreeElement
             || treeElement instanceof WebInspector.ScriptTreeElement
             || treeElement instanceof WebInspector.ContentFlowTreeElement) {

trunk/Source/WebInspectorUI/UserInterface/Views/ResourcesTabContentView.js

@@ -60 +60 @@
             || representedObject instanceof WebInspector.Resource
             || representedObject instanceof WebInspector.Script
-            || representedObject instanceof WebInspector.ContentFlow;
+            || representedObject instanceof WebInspector.ContentFlow
+            || representedObject instanceof WebInspector.Collection;
     }
 };