Changeset 246179 in webkit

Timestamp:

Jun 6, 2019, 4:37:12 PM (7 years ago)

Author:

Devin Rousso

Message:

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

Location:

trunk/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/CPUTimelineView.css (modified) (2 diffs)
• UserInterface/Views/CPUTimelineView.js (modified) (1 diff)
• UserInterface/Views/CPUUsageCombinedView.css (modified) (1 diff)
• UserInterface/Views/Variables.css (modified) (1 diff)

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebInspectorUI/UserInterface/Views/CPUTimelineView.css

@@ -151 +151 @@
 
 .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);
 }
 
@@ -175 +175 @@
 }
 
-.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);
 }
 

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

@@ -55 +55 @@
     {
         switch (type) {
-        case CPUTimelineView.SampleType.Script:
+        case CPUTimelineView.SampleType.JavaScript:
             return WI.UIString("JavaScript");
         case CPUTimelineView.SampleType.Layout:

trunk/Source/WebInspectorUI/UserInterface/Views/CPUUsageCombinedView.css

@@ -128 +128 @@
 }
 
-.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);
 }
 

trunk/Source/WebInspectorUI/UserInterface/Views/Variables.css

@@ -141 +141 @@
     --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%);