Attachment 164280 Details for Bug 96733 – Patch

[patch] Patch

bug96733.patch (text/plain), 22.94 KB, created by Andrei Poenaru on 2012-09-15 03:56:33 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrei Poenaru

Created: 2012-09-15 03:56:33 PDT

Size: 22.94 KB

patch

obsolete

>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7ae1b4f..1710fb9 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,48 @@
>+2012-09-15  Andrei Poenaru  <poenaru@adobe.com>
>+
>+        Web Inspector: Display Named Flows in the Tabbed Pane of the "CSS Named Flows" Drawer
>+        https://bugs.webkit.org/show_bug.cgi?id=96733
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added functionality to the Tabbed Pane from the CSS Named Flows Drawer.
>+
>+        * English.lproj/localizedStrings.js:
>+        * WebCore.gypi:
>+        * WebCore.vcproj/WebCore.vcproj:
>+        * inspector/compile-front-end.py:
>+        * inspector/front-end/CSSNamedFlowCollectionsView.js:
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype._appendNamedFlow):
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype._removeNamedFlow):
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype._updateNamedFlow):
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype._showNamedFlow):
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype._selectNamedFlowTab):
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype._tabSelected):
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype._tabClosed):
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype.wasShown):
>+        (WebInspector.CSSNamedFlowCollectionsView.prototype.willHide):
>+        * inspector/front-end/CSSNamedFlowView.js: Added.
>+        (WebInspector.CSSNamedFlowView):
>+        (WebInspector.CSSNamedFlowView.prototype._createFlowElement):
>+        (WebInspector.CSSNamedFlowView.prototype._insertContentNode):
>+        (WebInspector.CSSNamedFlowView.prototype._insertRegion):
>+        (WebInspector.CSSNamedFlowView.prototype.get flow):
>+        (WebInspector.CSSNamedFlowView.prototype.set flow):
>+        (WebInspector.CSSNamedFlowView.prototype._updateRegionOverset):
>+        (WebInspector.CSSNamedFlowView.prototype._update):
>+        * inspector/front-end/ElementsPanel.js:
>+        * inspector/front-end/Images/regionEmpty.png: Added.
>+        * inspector/front-end/Images/regionFit.png: Added.
>+        * inspector/front-end/Images/regionOverset.png: Added.
>+        * inspector/front-end/WebKit.qrc:
>+        * inspector/front-end/cssNamedFlows.css:
>+        (.css-named-flow-collections-view .split-view-sidebar-left .named-flow-overflow::before, .css-named-flow-collections-view .region-empty:before, .css-named-flow-collections-view .region-fit::before, .css-named-flow-collections-view .region-overset::before):
>+        (.css-named-flow-collections-view .split-view-sidebar-left .named-flow-overflow::before):
>+        (.css-named-flow-collections-view .region-empty::before):
>+        (.css-named-flow-collections-view .region-fit::before):
>+        (.css-named-flow-collections-view .region-overset::before):
>+        (.css-named-flow-collections-view .split-view-contents .named-flow-element):
>+
> 2012-09-14  Sheriff Bot  <webkit.review.bot@gmail.com>
> 
>         Unreviewed, rolling out r128673.
>diff --git a/Source/WebCore/English.lproj/localizedStrings.js b/Source/WebCore/English.lproj/localizedStrings.js
>index 5bf72de..b6bf065 100644
>--- a/Source/WebCore/English.lproj/localizedStrings.js
>+++ b/Source/WebCore/English.lproj/localizedStrings.js
>@@ -334,6 +334,9 @@ localizedStrings["Record"] = "Record";
> localizedStrings["Recordingâ¦"] = "Recordingâ¦";
> localizedStrings["Redirect"] = "Redirect";
> localizedStrings["Refresh"] = "Refresh";
>+localizedStrings["Region is empty."] = "Region is empty.";
>+localizedStrings["Region is fit."] = "Region is fit.";
>+localizedStrings["Region is overset."] = "Region is overset.";
> localizedStrings["Remove Breakpoint"] = "Remove Breakpoint";
> localizedStrings["Remove breakpoint"] = "Remove breakpoint";
> localizedStrings["Remove Timer"] = "Remove Timer";
>diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
>index 4085311..d2913d9 100644
>--- a/Source/WebCore/WebCore.gypi
>+++ b/Source/WebCore/WebCore.gypi
>@@ -6497,6 +6497,7 @@
>         ],
>         'webinspector_elements_js_files': [
>             'inspector/front-end/CSSNamedFlowCollectionsView.js',
>+            'inspector/front-end/CSSNamedFlowView.js',
>             'inspector/front-end/ElementsPanel.js',
>             'inspector/front-end/EventListenersSidebarPane.js',
>             'inspector/front-end/MetricsSidebarPane.js',
>@@ -6667,6 +6668,9 @@
>             'inspector/front-end/Images/profilesSilhouette.png',
>             'inspector/front-end/Images/programCounterBorder.png',
>             'inspector/front-end/Images/radioDot.png',
>+            'inspector/front-end/Images/regionEmpty.png',
>+            'inspector/front-end/Images/regionFit.png',
>+            'inspector/front-end/Images/regionOverset.png',
>             'inspector/front-end/Images/resourceCSSIcon.png',
>             'inspector/front-end/Images/resourceDocumentIcon.png',
>             'inspector/front-end/Images/resourceDocumentIconSmall.png',
>diff --git a/Source/WebCore/WebCore.vcproj/WebCore.vcproj b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
>index eec6b5e..7836dee 100755
>--- a/Source/WebCore/WebCore.vcproj/WebCore.vcproj
>+++ b/Source/WebCore/WebCore.vcproj/WebCore.vcproj
>@@ -76030,6 +76030,10 @@
> 					>
> 				</File>
> 				<File
>+					RelativePath="..\inspector\front-end\CSSNamedFlowView.js"
>+					>
>+				</File>
>+				<File
> 					RelativePath="..\inspector\front-end\cssNamedFlows.css"
> 					>
> 				</File>
>diff --git a/Source/WebCore/inspector/compile-front-end.py b/Source/WebCore/inspector/compile-front-end.py
>index ef235bf..03eaeee 100755
>--- a/Source/WebCore/inspector/compile-front-end.py
>+++ b/Source/WebCore/inspector/compile-front-end.py
>@@ -180,6 +180,7 @@ modules = [
>         "dependencies": ["components"],
>         "sources": [
>             "CSSNamedFlowCollectionsView.js",
>+            "CSSNamedFlowView.js",
>             "ElementsPanel.js",
>             "ElementsPanelDescriptor.js",
>             "EventListenersSidebarPane.js",
>diff --git a/Source/WebCore/inspector/front-end/CSSNamedFlowCollectionsView.js b/Source/WebCore/inspector/front-end/CSSNamedFlowCollectionsView.js
>index b6be9e7..8b48836 100644
>--- a/Source/WebCore/inspector/front-end/CSSNamedFlowCollectionsView.js
>+++ b/Source/WebCore/inspector/front-end/CSSNamedFlowCollectionsView.js
>@@ -133,8 +133,12 @@ WebInspector.CSSNamedFlowCollectionsView.prototype = {
>         container.createChild("span", "title").createChild("span").textContent = flow.name;
> 
>         var flowTreeElement = new TreeElement(container, flowContainer);
>-        if (flow.overset)
>+        flowTreeElement.onselect = this._selectNamedFlowTab.bind(this, flowHash);
>+
>+        if (flow.overset) {
>             flowTreeElement.title.addStyleClass("named-flow-overflow")
>+            flowTreeElement.tooltip = WebInspector.UIString("Overflows.");
>+        }
> 
>         flowContainer.flowTreeElement = flowTreeElement;
>         this._namedFlows[flowHash] = flowContainer;
>@@ -151,6 +155,8 @@ WebInspector.CSSNamedFlowCollectionsView.prototype = {
>     {
>         var flowContainer = this._namedFlows[flowHash];
> 
>+        if (this._tabbedPane._tabsById[flowHash])
>+            this._tabbedPane.closeTab(flowHash);
>         this._flowTree.removeChild(flowContainer.flowTreeElement);
> 
>         var flow = flowContainer.flow;
>@@ -190,11 +196,17 @@ WebInspector.CSSNamedFlowCollectionsView.prototype = {
>             this._regionNodes[flow.regions[i].nodeId] = flowHash;
> 
>         if (flow.overset !== oldFlow.overset) {
>-            if (flow.overset)
>+            if (flow.overset) {
>                 flowContainer.flowTreeElement.title.addStyleClass("named-flow-overflow");
>-            else
>+                flowContainer.flowTreeElement.tooltip = WebInspector.UIString("Overflows.");
>+            } else {
>                 flowContainer.flowTreeElement.title.removeStyleClass("named-flow-overflow");
>+                flowContainer.flowTreeElement.tooltip = "";
>+            }
>         }
>+
>+        if (flowContainer.flowView)
>+            flowContainer.flowView.flow = flow;
>     },
> 
>     /**
>@@ -268,6 +280,7 @@ WebInspector.CSSNamedFlowCollectionsView.prototype = {
>     _showNamedFlow: function(flowHash)
>     {
>         this._selectNamedFlowInSidebar(flowHash);
>+        this._selectNamedFlowTab(flowHash);
>     },
> 
>     /**
>@@ -279,6 +292,25 @@ WebInspector.CSSNamedFlowCollectionsView.prototype = {
>     },
> 
>     /**
>+     * @param {string} flowHash
>+     */
>+    _selectNamedFlowTab: function(flowHash)
>+    {
>+        var flowContainer = this._namedFlows[flowHash];
>+
>+        if (this._tabbedPane.selectedTabId === flowHash)
>+            return;
>+
>+        if (!this._tabbedPane.selectTab(flowHash)) {
>+            if (!flowContainer.flowView)
>+                flowContainer.flowView =  new WebInspector.CSSNamedFlowView(flowContainer.flow);
>+
>+            this._tabbedPane.appendTab(flowHash, flowContainer.flow.name, flowContainer.flowView);
>+            this._tabbedPane.selectTab(flowHash);
>+        }
>+    },
>+
>+    /**
>      * @param {WebInspector.Event} event
>      */
>     _selectedNodeChanged: function(event)
>@@ -288,6 +320,22 @@ WebInspector.CSSNamedFlowCollectionsView.prototype = {
>     },
> 
>     /**
>+     * @param {WebInspector.Event} event
>+     */
>+    _tabSelected: function(event)
>+    {
>+        this._selectNamedFlowInSidebar(event.data.tabId);
>+    },
>+
>+    /**
>+     * @param {WebInspector.Event} event
>+     */
>+    _tabClosed: function(event)
>+    {
>+        this._namedFlows[event.data.tabId].flowTreeElement.deselect();
>+    },
>+
>+    /**
>      * @param {?WebInspector.DOMNode} node
>      */
>     _showNamedFlowForNode: function(node)
>@@ -323,6 +371,9 @@ WebInspector.CSSNamedFlowCollectionsView.prototype = {
>         WebInspector.cssModel.addEventListener(WebInspector.CSSStyleModel.Events.RegionLayoutUpdated, this._regionLayoutUpdated, this);
> 
>         WebInspector.panel("elements").treeOutline.addEventListener(WebInspector.ElementsTreeOutline.Events.SelectedNodeChanged, this._selectedNodeChanged, this);
>+
>+        this._tabbedPane.addEventListener(WebInspector.TabbedPane.EventTypes.TabSelected, this._tabSelected, this);
>+        this._tabbedPane.addEventListener(WebInspector.TabbedPane.EventTypes.TabClosed, this._tabClosed, this);
>     },
> 
>     willHide: function()
>@@ -334,6 +385,9 @@ WebInspector.CSSNamedFlowCollectionsView.prototype = {
>         WebInspector.cssModel.removeEventListener(WebInspector.CSSStyleModel.Events.RegionLayoutUpdated, this._regionLayoutUpdated, this);
> 
>         WebInspector.panel("elements").treeOutline.removeEventListener(WebInspector.ElementsTreeOutline.Events.SelectedNodeChanged, this._selectedNodeChanged, this);
>+
>+        this._tabbedPane.removeEventListener(WebInspector.TabbedPane.EventTypes.TabSelected, this._tabSelected, this);
>+        this._tabbedPane.removeEventListener(WebInspector.TabbedPane.EventTypes.TabClosed, this._tabClosed, this);
>     }
> }
> 
>diff --git a/Source/WebCore/inspector/front-end/CSSNamedFlowView.js b/Source/WebCore/inspector/front-end/CSSNamedFlowView.js
>new file mode 100644
>index 0000000..85f75f0
>--- /dev/null
>+++ b/Source/WebCore/inspector/front-end/CSSNamedFlowView.js
>@@ -0,0 +1,233 @@
>+/*
>+ * Copyright (C) 2012 Adobe Systems Incorporated. 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 documentation and/or other materials
>+ *    provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
>+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
>+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
>+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
>+ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
>+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
>+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
>+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
>+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
>+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
>+ * OF THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+/**
>+ * @constructor
>+ * @extends {WebInspector.View}
>+ * @param {WebInspector.NamedFlow} flow
>+ */
>+ WebInspector.CSSNamedFlowView = function(flow)
>+ {
>+    WebInspector.View.call(this);
>+    this.element.addStyleClass("css-named-flow");
>+    this.element.addStyleClass("outline-disclosure");
>+
>+    this._treeOutline = new TreeOutline(this.element.createChild("ol"), true);
>+
>+    this._contentElement = new TreeElement("content", null, true);
>+    this._treeOutline.appendChild(this._contentElement);
>+
>+    this._regionsElement = new TreeElement("region chain", null, true);
>+    this._regionsElement.expand();
>+    this._treeOutline.appendChild(this._regionsElement);
>+
>+    this._flow = flow;
>+
>+    var content = flow.content;
>+    for (var i = 0; i < content.length; ++i)
>+        this._insertContentNode(content[i]);
>+
>+    var regions = flow.regions;
>+    for (var i = 0; i < regions.length; ++i)
>+        this._insertRegion(regions[i]);
>+ }
>+
>+ WebInspector.CSSNamedFlowView.prototype = {
>+    /**
>+     * @param {WebInspector.DOMNode|undefined} rootDOMNode
>+     * @return {WebInspector.ElementsTreeOutline|null}
>+     */
>+    _createFlowElement: function(rootDOMNode)
>+    {
>+        if (!rootDOMNode)
>+            return null;
>+
>+        var treeOutline = new WebInspector.ElementsTreeOutline(false, false, true);
>+        treeOutline.element.addStyleClass("named-flow-element");
>+        treeOutline.setVisible(true);
>+        treeOutline.rootDOMNode = rootDOMNode;
>+        treeOutline.wireToDomAgent();
>+        WebInspector.domAgent.removeEventListener(WebInspector.DOMAgent.Events.DocumentUpdated, treeOutline._elementsTreeUpdater._documentUpdated, treeOutline._elementsTreeUpdater);
>+
>+        return treeOutline;        
>+    },
>+
>+    /**
>+     * @param {DOMAgent.NodeId} contentNodeId
>+     * @param {number=} index
>+     */
>+    _insertContentNode: function(contentNodeId, index)
>+    {
>+        var treeOutline = this._createFlowElement(WebInspector.domAgent.nodeForId(contentNodeId));
>+        var treeElement = new TreeElement(treeOutline.element, treeOutline);
>+
>+        if (index === undefined) {
>+            this._contentElement.appendChild(treeElement);
>+            return;
>+        }
>+
>+        this._contentElement.insertChild(treeElement, index);
>+    },
>+
>+    /**
>+     * @param {CSSAgent.Region} region
>+     * @param {number=} index
>+     */
>+    _insertRegion: function(region, index)
>+    {
>+        var treeOutline = this._createFlowElement(WebInspector.domAgent.nodeForId(region.nodeId));
>+        treeOutline.element.addStyleClass("region-" + region.regionOverset);
>+
>+        var treeElement = new TreeElement(treeOutline.element, treeOutline);
>+        treeElement.tooltip = WebInspector.UIString("Region is " + region.regionOverset + ".");
>+
>+        if (index === undefined) {
>+            this._regionsElement.appendChild(treeElement);
>+            return;
>+        }
>+
>+        this._regionsElement.insertChild(treeElement, index);
>+    },
>+
>+    get flow()
>+    {
>+        return this._flow;
>+    },
>+
>+    set flow(newFlow)
>+    {
>+        this._update(newFlow);
>+    },
>+
>+    /**
>+     * @param {TreeElement} regionTreeElement
>+     * @param {string} newRegionOverset
>+     * @param {string} oldRegionOverset
>+     */
>+    _updateRegionOverset: function(regionTreeElement, newRegionOverset, oldRegionOverset)
>+    {
>+        var element = regionTreeElement.representedObject.element;
>+        element.removeStyleClass("region-" + oldRegionOverset);
>+        element.addStyleClass("region-" + newRegionOverset);
>+
>+        regionTreeElement.tooltip = WebInspector.UIString("Region is " + newRegionOverset + ".");
>+    },
>+
>+    /**
>+     * @param {WebInspector.NamedFlow} newFlow
>+     */
>+    _update: function(newFlow)
>+    {
>+        var i, j, k;
>+        var nodeIdSet = {};
>+
>+        var oldContent = this._flow.content;
>+        var newContent = newFlow.content;
>+
>+        for (i = 0; i < newContent.length; ++i)
>+            nodeIdSet[newContent[i]] = true;
>+        i = 0; // oldContent
>+        j = 0; // newContent
>+        k = 0; // this._contentElement.children
>+
>+        /** Merge content nodes */
>+        while(i < oldContent.length || j < newContent.length) {
>+            if (i === oldContent.length) {
>+                this._insertContentNode(newContent[j]);
>+                ++j;
>+                continue;
>+            }
>+
>+            if (j === newContent.length) {
>+                this._contentElement.removeChildAtIndex(k);
>+                ++i;
>+                continue;
>+            }
>+
>+            if (oldContent[i] === newContent[j]) {
>+                ++i, ++j, ++k;
>+                continue;
>+            }
>+
>+            if (nodeIdSet[oldContent[i]]) {
>+                this._insertContentNode(newContent[j], k);
>+                ++j, ++k;
>+                continue;
>+            }
>+
>+            this._contentElement.removeChildAtIndex(k);
>+            ++i;
>+        }
>+
>+        var oldRegions = this._flow.regions;
>+        var newRegions = newFlow.regions;
>+
>+        nodeIdSet = {};
>+        for (i = 0; i < newRegions.length; ++i)
>+            nodeIdSet[newRegions[i].nodeId] = true;
>+        i = 0; // oldRegions
>+        j = 0; // newRegions
>+        k = 0; // this._regionsElement.children
>+
>+        /** Merge regions */
>+        while(i < oldRegions.length || j < newRegions.length) {
>+            if (i === oldRegions.length) {
>+                this._insertRegion(newRegions[j]);
>+                ++j;
>+                continue;
>+            }
>+
>+            if (j === newRegions.length) {
>+                this._regionsElement.removeChildAtIndex(k);
>+                ++i;
>+                continue;
>+            }
>+
>+            if (oldRegions[i].nodeId === newRegions[j].nodeId) {
>+                if (oldRegions[i].regionOverset !== newRegions[j].regionOverset)
>+                    this._updateRegionOverset(this._regionsElement.children[k], newRegions[j].regionOverset, oldRegions[i].regionOverset)
>+                ++i, ++j, ++k;
>+                continue;
>+            }
>+
>+            if (nodeIdSet[oldRegions[i].nodeId]) {
>+                this._insertRegion(newRegions[j], k);
>+                ++j, ++k;
>+                continue;
>+            }
>+
>+            this._regionsElement.removeChildAtIndex(k);
>+            ++i;
>+        }
>+
>+        this._flow = newFlow;
>+    }
>+ }
>+
>+ WebInspector.CSSNamedFlowView.prototype.__proto__ = WebInspector.View.prototype;
>diff --git a/Source/WebCore/inspector/front-end/ElementsPanel.js b/Source/WebCore/inspector/front-end/ElementsPanel.js
>index e735880..2fa6fc3 100644
>--- a/Source/WebCore/inspector/front-end/ElementsPanel.js
>+++ b/Source/WebCore/inspector/front-end/ElementsPanel.js
>@@ -29,6 +29,7 @@
>  */
> 
> importScript("CSSNamedFlowCollectionsView.js");
>+importScript("CSSNamedFlowView.js");
> importScript("EventListenersSidebarPane.js");
> importScript("MetricsSidebarPane.js");
> importScript("PropertiesSidebarPane.js");
>diff --git a/Source/WebCore/inspector/front-end/Images/regionEmpty.png b/Source/WebCore/inspector/front-end/Images/regionEmpty.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..9b62eb5f7a6eb1f0da17bf5c4e0bbbfbea2cb5c8
>GIT binary patch
>literal 115
>zcmeAS@N?(olHy`uVBq!ia0vp^AT}2hGm!icqpk;}I0Jk_T>t<7KXc~Hw6wHluU+my
>zLB^6GzhDN3XE)M-90^Ys#}E$L<cKXR8W~v}84fv3Fxa@nm6u_k52vTr!+Gz4Y8X6S
>L{an^LB{Ts5PIVvn
>
>literal 0
>HcmV?d00001
>
>diff --git a/Source/WebCore/inspector/front-end/Images/regionFit.png b/Source/WebCore/inspector/front-end/Images/regionFit.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..88fb4085515843eb9509fac2f80c4d353230dc65
>GIT binary patch
>literal 109
>zcmeAS@N?(olHy`uVBq!ia0vp^AT}2xGmzZ=C-xtZVhivIasB`QKad%E=yDy9Vk`;r
>z3ubV5b|VeQ5%qL&4B?1Q{&D}ng$oBZ@Hew8`p?U-@h11q(#O_bKm`n*u6{1-oD!M<
>D4qG90
>
>literal 0
>HcmV?d00001
>
>diff --git a/Source/WebCore/inspector/front-end/Images/regionOverset.png b/Source/WebCore/inspector/front-end/Images/regionOverset.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..ee930d8dd1cc9d8855eac3b07f46ab557192f162
>GIT binary patch
>literal 123
>zcmeAS@N?(olHy`uVBq!ia0vp^AT}2hGm!icqpk;}cmjMvT>k?>TH1eOW1ztLUk?m`
>z6k|z{UoeBivm0qZj;yDPV+cod@{j-j8JIcd{crY~AH}rPn9ral!H$7p-aX+J*CM(%
>Q0u?fNy85}Sb4q9e0JEtixc~qF
>
>literal 0
>HcmV?d00001
>
>diff --git a/Source/WebCore/inspector/front-end/WebKit.qrc b/Source/WebCore/inspector/front-end/WebKit.qrc
>index 2e1e2a2..cfeb194 100644
>--- a/Source/WebCore/inspector/front-end/WebKit.qrc
>+++ b/Source/WebCore/inspector/front-end/WebKit.qrc
>@@ -32,6 +32,7 @@
>     <file>CSSCompletions.js</file>
>     <file>CSSKeywordCompletions.js</file>
>     <file>CSSNamedFlowCollectionsView.js</file>
>+    <file>CSSNamedFlowView.js</file>
>     <file>CSSSelectorProfileView.js</file>
>     <file>CSSStyleModel.js</file>
>     <file>cm/codemirror.css</file>
>@@ -307,6 +308,9 @@
>     <file>Images/profilesSilhouette.png</file>
>     <file>Images/programCounterBorder.png</file>
>     <file>Images/radioDot.png</file>
>+    <file>Images/regionEmpty.png</file>
>+    <file>Images/regionFit.png</file>
>+    <file>Images/regionOverset.png</file>
>     <file>Images/resourceCSSIcon.png</file>
>     <file>Images/resourceDocumentIcon.png</file>
>     <file>Images/resourceDocumentIconSmall.png</file>
>diff --git a/Source/WebCore/inspector/front-end/cssNamedFlows.css b/Source/WebCore/inspector/front-end/cssNamedFlows.css
>index 523a516..d090b2e 100644
>--- a/Source/WebCore/inspector/front-end/cssNamedFlows.css
>+++ b/Source/WebCore/inspector/front-end/cssNamedFlows.css
>@@ -64,14 +64,34 @@
>     position: relative;
> }
> 
>-.css-named-flow-collections-view .split-view-sidebar-left .named-flow-overflow::before {
>-    content: url(Images/namedFlowOverflow.png);
>+.css-named-flow-collections-view .split-view-sidebar-left .named-flow-overflow::before, .css-named-flow-collections-view .region-empty:before, .css-named-flow-collections-view .region-fit::before, .css-named-flow-collections-view .region-overset::before {
>     cursor: default;
>     float: left;
>     height: 10px;
>-    margin: 2px 3px 0px -13px;
>+    margin-top: 1px;
>     opacity: 0.75;
>     position: relative;
>     vertical-align: middle;
>     z-index: 1;
> }
>+
>+.css-named-flow-collections-view .split-view-sidebar-left .named-flow-overflow::before {
>+    content: url(Images/namedFlowOverflow.png);
>+    margin: 2px 3px 0px -13px;
>+}
>+
>+.css-named-flow-collections-view .region-empty::before {
>+    content: url(Images/regionEmpty.png);
>+}
>+
>+.css-named-flow-collections-view .region-fit::before {
>+    content: url(Images/regionFit.png);
>+}
>+
>+.css-named-flow-collections-view .region-overset::before {
>+    content: url(Images/regionOverset.png);
>+}
>+
>+.css-named-flow-collections-view .split-view-contents .named-flow-element {
>+    margin: 0px 0px 0px -24px;
>+}

Flags:

apavlov: review-

Actions: View | Formatted Diff | Diff

Attachments on bug 96733: 164188 | 164280 | 164283 | 164393 | 164398 | 164402