Changeset 196284 in webkit

Timestamp:

Feb 8, 2016 5:50:08 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Zooming in on the timeline graph does not increase its time resolution from minutes
​https://bugs.webkit.org/show_bug.cgi?id=154013
<rdar://problem/23844527>

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-02-08
Reviewed by Brian Burg.

Source/WebInspectorUI:

• UserInterface/Base/Utilities.js:

(Number.secondsToString):
Simplify logic and ensure that when under high resolution we
don't go above seconds for our units.

(Number.bytesToString):
Simplify logic.

• UserInterface/Views/LinearTimelineOverview.js:

(WebInspector.LinearTimelineOverview):
Reduce the rather large maximum seconds per pixel from 60 seconds
per pixel to 2 seconds per pixel. This means when the user zooms
out of a timeline they don't see such large time values.

LayoutTests:

• inspector/unit-tests/number-utilities-expected.txt: Added.
• inspector/unit-tests/number-utilities.html: Added.

Basic tests for our Number utilities methods.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/unit-tests/number-utilities-expected.txt (added)
• LayoutTests/inspector/unit-tests/number-utilities.html (added)
• Source/WebInspectorUI/ChangeLog (modified) (1 diff)
• Source/WebInspectorUI/UserInterface/Base/Utilities.js (modified) (2 diffs)
• Source/WebInspectorUI/UserInterface/Views/LinearTimelineOverview.js (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-08  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Zooming in on the timeline graph does not increase its time resolution from minutes
+        https://bugs.webkit.org/show_bug.cgi?id=154013
+        <rdar://problem/23844527>
+
+        Reviewed by Brian Burg.
+
+        * inspector/unit-tests/number-utilities-expected.txt: Added.
+        * inspector/unit-tests/number-utilities.html: Added.
+        Basic tests for our Number utilities methods.
+
 2016-02-08  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2016-02-08  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Zooming in on the timeline graph does not increase its time resolution from minutes
+        https://bugs.webkit.org/show_bug.cgi?id=154013
+        <rdar://problem/23844527>
+
+        Reviewed by Brian Burg.
+
+        * UserInterface/Base/Utilities.js:
+        (Number.secondsToString):
+        Simplify logic and ensure that when under high resolution we
+        don't go above seconds for our units.
+
+        (Number.bytesToString):
+        Simplify logic.
+
+        * UserInterface/Views/LinearTimelineOverview.js:
+        (WebInspector.LinearTimelineOverview):
+        Reduce the rather large maximum seconds per pixel from 60 seconds
+        per pixel to 2 seconds per pixel. This means when the user zooms
+        out of a timeline they don't see such large time values.
+
 2016-02-08  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebInspectorUI/UserInterface/Base/Utilities.js

@@ -873 +873 @@
     value: function(seconds, higherResolution)
     {
-        var ms = seconds * 1000;
-
-        if (higherResolution && Math.abs(ms) < 10)
-            return WebInspector.UIString("%.3fms").format(ms);
-        else if (Math.abs(ms) < 10)
+        let ms = seconds * 1000;
+
+        if (Math.abs(ms) < 10) {
+            if (higherResolution)
+                return WebInspector.UIString("%.3fms").format(ms);
             return WebInspector.UIString("%.2fms").format(ms);
-
-        if (higherResolution && Math.abs(ms) < 100)
-            return WebInspector.UIString("%.2fms").format(ms);
-        else if (Math.abs(ms) < 100)
+        }
+
+        if (Math.abs(ms) < 100) {
+            if (higherResolution)
+                return WebInspector.UIString("%.2fms").format(ms);
             return WebInspector.UIString("%.1fms").format(ms);
-
-        if (higherResolution && Math.abs(ms) < 1000)
-            return WebInspector.UIString("%.1fms").format(ms);
-        else if (Math.abs(ms) < 1000)
+        }
+
+        if (Math.abs(ms) < 1000) {
+            if (higherResolution)
+                return WebInspector.UIString("%.1fms").format(ms);
             return WebInspector.UIString("%.0fms").format(ms);
-
-        if (Math.abs(seconds) < 60)
+        }
+
+        // Do not go over seconds when in high resolution mode.
+        if (higherResolution || Math.abs(seconds) < 60)
             return WebInspector.UIString("%.2fs").format(seconds);
 
-        var minutes = seconds / 60;
+        let minutes = seconds / 60;
         if (Math.abs(minutes) < 60)
             return WebInspector.UIString("%.1fmin").format(minutes);
 
-        var hours = minutes / 60;
+        let hours = minutes / 60;
         if (Math.abs(hours) < 24)
             return WebInspector.UIString("%.1fhrs").format(hours);
 
-        var days = hours / 24;
+        let days = hours / 24;
         return WebInspector.UIString("%.1f days").format(days);
     }
@@ -916 +920 @@
             return WebInspector.UIString("%.0f B").format(bytes);
 
-        var kilobytes = bytes / 1024;
-        if (Math.abs(kilobytes) < 10 || (higherResolution && Math.abs(kilobytes) < 1024))
-            return WebInspector.UIString("%.2f KB").format(kilobytes);
-        else if (Math.abs(kilobytes) < 1024)
+        let kilobytes = bytes / 1024;
+        if (Math.abs(kilobytes) < 1024) {
+            if (higherResolution || Math.abs(kilobytes) < 10)
+                return WebInspector.UIString("%.2f KB").format(kilobytes);
             return WebInspector.UIString("%.1f KB").format(kilobytes);
-
-        var megabytes = kilobytes / 1024;
+        }
+
+        let megabytes = kilobytes / 1024;
         if (higherResolution || Math.abs(megabytes) < 10)
             return WebInspector.UIString("%.2f MB").format(megabytes);
-        else
-            return WebInspector.UIString("%.1f MB").format(megabytes);
+        return WebInspector.UIString("%.1f MB").format(megabytes);
     }
 });

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

@@ -34 +34 @@
         };
 
-        super("linear", timelineRecording, 0.0001, 60, defaultSettingsValues);
+        super("linear", timelineRecording, 0.0001, 2, defaultSettingsValues);
     }