Attachment 370803 Details for Bug 198299 – Patch

[patch] Patch

bug-198299-20190528163351.patch (text/plain), 10.46 KB, created by Devin Rousso on 2019-05-28 16:33:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-05-28 16:33:52 PDT

Size: 10.46 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index c3bc6a7a39643bb77d8d0c4da49590423257ee1e..da0997eba7504d228e0b1a20ae57385001f6fe2a 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1,3 +1,35 @@
>+2019-05-28  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: Timelines: spacing around pie chart is different between CPU and Memory
>+        https://bugs.webkit.org/show_bug.cgi?id=198299
>+
>+        Reviewed by Matt Baker.
>+
>+        "Style Resolution" is a much longer string than any of the legend strings in the Memory
>+        timeline, and causes the CPU timeline legend to shift as a result.
>+
>+        Rename "Script" to "JavaScript" and "Style Resolution" to "Styles" so that the strings are
>+        roughly the same length between the CPU and Memory timelines, meaning that they will appear
>+        in the same spot with similar sizing.
>+
>+        * UserInterface/Views/CPUTimelineView.js:
>+        (WI.CPUTimelineView.displayNameForSampleType):
>+        (WI.CPUTimelineView.prototype.initialLayout):
>+        (WI.CPUTimelineView.prototype._computeStatisticsData):
>+        Drive-by: remove the `WI` prefix from all `CPUTimelineView.SampleType` since it's within the
>+        same class.
>+
>+        * UserInterface/Views/CPUTimelineView.css:
>+        (.timeline-view.cpu > .content > .overview .legend > .row > .swatch.sample-type-javascript): Added.
>+        (.timeline-view.cpu > .content > .overview .legend > .row > .swatch.sample-type-script): Deleted.
>+        Drive-by: move the `.overview` rules lower to be in the same area as the `.overview *` rules.
>+
>+        * UserInterface/Views/MemoryTimelineView.css:
>+        (.timeline-view.memory > .content > .overview):
>+        Drive-by: remove duplicate CSS rule.
>+
>+        * Localizations/en.lproj/localizedStrings.js:
>+
> 2019-05-28  Nikita Vasilyev  <nvasilyev@apple.com>
> 
>         Web Inspector: Provide UIString descriptions to improve localizations
>diff --git a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>index e056d18c6cd09e831cdb312b43fef97554b4898d..61a63306128069174fed0e8ce40ea154c8a1878b 100644
>--- a/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>+++ b/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
>@@ -1041,7 +1041,6 @@ localizedStrings["Stopping the \u201C%s\u201D audit"] = "Stopping the \u201C%s\u
> localizedStrings["Storage"] = "Storage";
> /* CSS properties defined via HTML style attribute */
> localizedStrings["Style Attribute"] = "Style Attribute";
>-localizedStrings["Style Resolution"] = "Style Resolution";
> localizedStrings["Style rule"] = "Style rule";
> localizedStrings["Styles"] = "Styles";
> localizedStrings["Styles Invalidated"] = "Styles Invalidated";
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css
>index da3c8755b8ad44236b659cc6e808a83a1cb60d51..d7b3b6652177878288dbef7d5f5ecc76215627a8 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css
>@@ -27,17 +27,6 @@ body .timeline-view.cpu {
>     overflow: scroll;
> }
> 
>-.timeline-view.cpu > .content > .overview {
>-    display: flex;
>-    justify-content: center;
>-    padding: 10px;
>-}
>-
>-.timeline-view.cpu > .content > .overview:not(:last-child) {
>-    margin-bottom: 10px;
>-    border-bottom: 1px solid var(--border-color);
>-}
>-
> .timeline-view.cpu > .content .subtitle {
>     font-family: -webkit-system-font, sans-serif;
>     font-size: 14px;
>@@ -95,6 +84,17 @@ body[dir=rtl] .timeline-view.cpu > .content > .details > .timeline-ruler {
>     background-color: var(--background-color-content);
> }
> 
>+.timeline-view.cpu > .content > .overview {
>+    display: flex;
>+    justify-content: center;
>+    padding: 10px;
>+}
>+
>+.timeline-view.cpu > .content > .overview:not(:last-child) {
>+    margin-bottom: 10px;
>+    border-bottom: 1px solid var(--border-color);
>+}
>+
> .timeline-view.cpu > .content > .overview > .chart {
>     width: 420px;
>     text-align: center;
>@@ -149,7 +149,7 @@ body[dir=rtl] .timeline-view.cpu > .content > .overview > .divider {
>     -webkit-margin-end: 8px;
> }
> 
>-.timeline-view.cpu > .content > .overview .legend > .row > .swatch.sample-type-script {
>+.timeline-view.cpu > .content > .overview .legend > .row > .swatch.sample-type-javascript {
>     border: 1px solid var(--cpu-script-stroke-color);
>     background-color: var(--cpu-script-fill-color);
> }
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js
>index 7864bb41b443f48ed20586f34f193ba511f32fac..3387c189826673731c91a7e2857e1948b23acdd7 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js
>@@ -54,14 +54,14 @@ WI.CPUTimelineView = class CPUTimelineView extends WI.TimelineView
>     static displayNameForSampleType(type)
>     {
>         switch (type) {
>-        case WI.CPUTimelineView.SampleType.Script:
>-            return WI.UIString("Script");
>-        case WI.CPUTimelineView.SampleType.Layout:
>+        case CPUTimelineView.SampleType.Script:
>+            return WI.UIString("JavaScript");
>+        case CPUTimelineView.SampleType.Layout:
>             return WI.repeatedUIString.timelineRecordLayout();
>-        case WI.CPUTimelineView.SampleType.Paint:
>+        case CPUTimelineView.SampleType.Paint:
>             return WI.repeatedUIString.timelineRecordPaint();
>-        case WI.CPUTimelineView.SampleType.Style:
>-            return WI.UIString("Style Resolution");
>+        case CPUTimelineView.SampleType.Style:
>+            return WI.UIString("Styles");
>         }
>         console.error("Unknown sample type", type);
>     }
>@@ -211,10 +211,10 @@ WI.CPUTimelineView = class CPUTimelineView extends WI.TimelineView
>         this._breakdownLegendElement = breakdownChartContainerElement.appendChild(document.createElement("div"));
>         this._breakdownLegendElement.classList.add("legend");
> 
>-        this._breakdownLegendScriptElement = appendLegendRow(this._breakdownLegendElement, WI.CPUTimelineView.SampleType.Script);
>-        this._breakdownLegendLayoutElement = appendLegendRow(this._breakdownLegendElement, WI.CPUTimelineView.SampleType.Layout);
>-        this._breakdownLegendPaintElement = appendLegendRow(this._breakdownLegendElement, WI.CPUTimelineView.SampleType.Paint);
>-        this._breakdownLegendStyleElement = appendLegendRow(this._breakdownLegendElement, WI.CPUTimelineView.SampleType.Style);
>+        this._breakdownLegendScriptElement = appendLegendRow(this._breakdownLegendElement, CPUTimelineView.SampleType.JavaScript);
>+        this._breakdownLegendLayoutElement = appendLegendRow(this._breakdownLegendElement, CPUTimelineView.SampleType.Layout);
>+        this._breakdownLegendPaintElement = appendLegendRow(this._breakdownLegendElement, CPUTimelineView.SampleType.Paint);
>+        this._breakdownLegendStyleElement = appendLegendRow(this._breakdownLegendElement, CPUTimelineView.SampleType.Style);
> 
>         let dividerElement = overviewElement.appendChild(document.createElement("div"));
>         dividerElement.classList.add("divider");
>@@ -1300,19 +1300,19 @@ WI.CPUTimelineView = class CPUTimelineView extends WI.TimelineView
>         }
> 
>         markRecordEntries(scriptRecords, (record) => {
>-            return WI.CPUTimelineView.SampleType.Script;
>+            return CPUTimelineView.SampleType.JavaScript;
>         });
> 
>         markRecordEntries(layoutRecords, (record) => {
>             switch (record.eventType) {
>             case WI.LayoutTimelineRecord.EventType.RecalculateStyles:
>-                return WI.CPUTimelineView.SampleType.Style;
>+                return CPUTimelineView.SampleType.Style;
>             case WI.LayoutTimelineRecord.EventType.ForcedLayout:
>             case WI.LayoutTimelineRecord.EventType.Layout:
>-                return WI.CPUTimelineView.SampleType.Layout;
>+                return CPUTimelineView.SampleType.Layout;
>             case WI.LayoutTimelineRecord.EventType.Paint:
>             case WI.LayoutTimelineRecord.EventType.Composite:
>-                return WI.CPUTimelineView.SampleType.Paint;
>+                return CPUTimelineView.SampleType.Paint;
>             }
>         });
> 
>@@ -1326,16 +1326,16 @@ WI.CPUTimelineView = class CPUTimelineView extends WI.TimelineView
>             case undefined:
>                 samplesIdle++;
>                 break;
>-            case WI.CPUTimelineView.SampleType.Script:
>+            case CPUTimelineView.SampleType.JavaScript:
>                 samplesScript++;
>                 break;
>-            case WI.CPUTimelineView.SampleType.Layout:
>+            case CPUTimelineView.SampleType.Layout:
>                 samplesLayout++;
>                 break;
>-            case WI.CPUTimelineView.SampleType.Paint:
>+            case CPUTimelineView.SampleType.Paint:
>                 samplesPaint++;
>                 break;
>-            case WI.CPUTimelineView.SampleType.Style:
>+            case CPUTimelineView.SampleType.Style:
>                 samplesStyle++;
>                 break;
>             }
>@@ -1822,7 +1822,7 @@ WI.CPUTimelineView.LayoutReason = {
> 
> // NOTE: UI follows this order.
> WI.CPUTimelineView.SampleType = {
>-    Script: "sample-type-script",
>+    JavaScript: "sample-type-javascript",
>     Layout: "sample-type-layout",
>     Paint: "sample-type-paint",
>     Style: "sample-type-style",
>diff --git a/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.css b/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.css
>index 9c5c2262d92e91fdc4c806570f012b47bd71236f..c81591ee66a564bbe7590c6646077f6d2d741365 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/MemoryTimelineView.css
>@@ -27,12 +27,6 @@ body .timeline-view.memory {
>     overflow: scroll;
> }
> 
>-.timeline-view.memory > .content > .overview {
>-    padding: 10px;
>-    margin-bottom: 10px;
>-    border-bottom: 1px solid var(--border-color);
>-}
>-
> .timeline-view.memory > .content .subtitle {
>     font-family: -webkit-system-font, sans-serif;
>     font-size: 14px;
>@@ -68,6 +62,9 @@ body[dir=rtl] .timeline-view.memory > .content > .details > .timeline-ruler {
> .timeline-view.memory > .content > .overview {
>     display: flex;
>     justify-content: center;
>+    margin-bottom: 10px;
>+    padding: 10px;
>+    border-bottom: 1px solid var(--border-color);
> }
> 
> .timeline-view.memory > .content > .overview > .chart {

Actions: View | Formatted Diff | Diff

Attachments on bug 198299: 370755 | 370756 | 370764 | 370803