Web Inspector: REGRESSION(r245833): Timelines: CPU: JavaScript label is missing and...
authordrousso@apple.com <drousso@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Jun 2019 23:37:12 +0000 (23:37 +0000)
committerdrousso@apple.com <drousso@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Jun 2019 23:37:12 +0000 (23:37 +0000)
https://bugs.webkit.org/show_bug.cgi?id=198627

Reviewed by Joseph Pecoraro.

* 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-*`.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@246179 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css
Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.js
Source/WebInspectorUI/UserInterface/Views/CPUUsageCombinedView.css
Source/WebInspectorUI/UserInterface/Views/Variables.css

index 6f67c51..12aab3a 100644 (file)
@@ -1,5 +1,28 @@
 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 Joseph Pecoraro.
+
+        * 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-*`.
+
+2019-06-06  Devin Rousso  <drousso@apple.com>
+
         Web Inspector: Formatter: pretty-print CSS using a Worker
         https://bugs.webkit.org/show_bug.cgi?id=197829
         <rdar://problem/36891532>
index d7b3b66..1b40409 100644 (file)
@@ -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 {
index 3387c18..53f1b62 100644 (file)
@@ -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();
index bfa424e..5a1b685 100644 (file)
@@ -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 {
index b082b5c..7cc1355 100644 (file)
     --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%);