Attachment 371532 Details for Bug 198627 – Patch

[patch] Patch

bug-198627-20190606155055.patch (text/plain), 5.37 KB, created by Devin Rousso on 2019-06-06 15:50:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Devin Rousso

Created: 2019-06-06 15:50:56 PDT

Size: 5.37 KB

patch

obsolete

>diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
>index e8d099365b10c918d5ccac368401dda01953947b..2f4c5eded8fae406b51fe268d05d47d3331cecf9 100644
>--- a/Source/WebInspectorUI/ChangeLog
>+++ b/Source/WebInspectorUI/ChangeLog
>@@ -1 +1,24 @@
>+2019-06-06  Devin Rousso  <drousso@apple.com>
>+
>+        Web Inspector: REGRESSION(r245833): Timelines: CPU: JavaScript label is missing and JavaScript section of pie chart is black
>+        https://bugs.webkit.org/show_bug.cgi?id=198627
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UserInterface/Views/CPUTimelineView.js:
>+        (WI.CPUTimelineView.displayNameForSampleType):
>+        * UserInterface/Views/CPUTimelineView.css:
>+        (.timeline-view.cpu > .content > .overview .legend > .row > .swatch.sample-type-javascript):
>+        (.timeline-view.cpu .circle-chart > svg > path.segment.sample-type-javascript): Added.
>+        (.timeline-view.cpu .circle-chart > svg > path.segment.sample-type-script): Deleted.
>+        * UserInterface/Views/CPUUsageCombinedView.css:
>+        (.cpu-usage-combined-view > .graph > .range-chart .sample-type-javascript): Added.
>+        (.cpu-usage-combined-view > .graph > .range-chart .sample-type-script): Deleted.
>+        Use the enum string added in r245833 (`sample-type-javascript`) instead of what was there
>+        before (`sample-type-script`).
>+
>+        * UserInterface/Views/Variables.css:
>+        (:root):
>+        Rename `--cpu-script-*` to `--cpu-javascript-*`.
>+
> == Rolled over to ChangeLog-2019-06-05 ==
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css
>index d7b3b6652177878288dbef7d5f5ecc76215627a8..1b40409f49e69ba371ed90e3f88300693dbd897d 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css
>@@ -150,8 +150,8 @@ body[dir=rtl] .timeline-view.cpu > .content > .overview > .divider {
> }
> 
> .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);
>+    border: 1px solid var(--cpu-javascript-stroke-color);
>+    background-color: var(--cpu-javascript-fill-color);
> }
> 
> .timeline-view.cpu > .content > .overview .legend > .row > .swatch.sample-type-style {
>@@ -174,9 +174,9 @@ body[dir=rtl] .timeline-view.cpu > .content > .overview > .divider {
>     fill: var(--cpu-idle-fill-color);
> }
> 
>-.timeline-view.cpu .circle-chart > svg > path.segment.sample-type-script {
>-    stroke: var(--cpu-script-stroke-color);
>-    fill: var(--cpu-script-fill-color);
>+.timeline-view.cpu .circle-chart > svg > path.segment.sample-type-javascript {
>+    stroke: var(--cpu-javascript-stroke-color);
>+    fill: var(--cpu-javascript-fill-color);
> }
> 
> .timeline-view.cpu .circle-chart > svg > path.segment.sample-type-style {
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js
>index 3387c189826673731c91a7e2857e1948b23acdd7..53f1b62e6dc129fd8687923e2a5fcd5655181306 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js
>+++ b/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js
>@@ -54,7 +54,7 @@ WI.CPUTimelineView = class CPUTimelineView extends WI.TimelineView
>     static displayNameForSampleType(type)
>     {
>         switch (type) {
>-        case CPUTimelineView.SampleType.Script:
>+        case CPUTimelineView.SampleType.JavaScript:
>             return WI.UIString("JavaScript");
>         case CPUTimelineView.SampleType.Layout:
>             return WI.repeatedUIString.timelineRecordLayout();
>diff --git a/Source/WebInspectorUI/UserInterface/Views/CPUUsageCombinedView.css b/Source/WebInspectorUI/UserInterface/Views/CPUUsageCombinedView.css
>index bfa424ed11030221a8b0d884542172ffffe2168e..5a1b6851f46bd2cd581da013dc0a59cd917e737f 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/CPUUsageCombinedView.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/CPUUsageCombinedView.css
>@@ -127,9 +127,9 @@ body[dir=rtl] .cpu-usage-combined-view > .graph {
>     stroke-opacity: 0.25;
> }
> 
>-.cpu-usage-combined-view > .graph > .range-chart .sample-type-script {
>-    stroke: var(--cpu-script-stroke-color);
>-    fill: var(--cpu-script-fill-color);
>+.cpu-usage-combined-view > .graph > .range-chart .sample-type-javascript {
>+    stroke: var(--cpu-javascript-stroke-color);
>+    fill: var(--cpu-javascript-fill-color);
> }
> 
> .cpu-usage-combined-view > .graph > .range-chart .sample-type-style {
>diff --git a/Source/WebInspectorUI/UserInterface/Views/Variables.css b/Source/WebInspectorUI/UserInterface/Views/Variables.css
>index b082b5c8a0edce59c291f8f2f638f8cc5289fcde..7cc1355e910354f423051446bd75b83b322878e5 100644
>--- a/Source/WebInspectorUI/UserInterface/Views/Variables.css
>+++ b/Source/WebInspectorUI/UserInterface/Views/Variables.css
>@@ -140,8 +140,8 @@
>     --cpu-worker-thread-stroke-color: hsl(59, 79%, 37%);
>     --cpu-overlay-color: var(--cpu-main-thread-stroke-color);
> 
>-    --cpu-script-fill-color: hsl(269, 65%, 75%);
>-    --cpu-script-stroke-color: hsl(269, 33%, 50%);
>+    --cpu-javascript-fill-color: hsl(269, 65%, 75%);
>+    --cpu-javascript-stroke-color: hsl(269, 33%, 50%);
>     --cpu-style-fill-color: hsl(22, 60%, 70%);
>     --cpu-style-stroke-color: hsl(22, 40%, 50%);
>     --cpu-layout-fill-color: hsl(0, 65%, 75%);

Actions: View | Formatted Diff | Diff

Attachments on bug 198627: 371532