Changeset 275558 in webkit

Timestamp:

Apr 6, 2021 3:09:10 PM (3 years ago)

Author:

Patrick Angle

Message:

Web Inspector: Grid overlay line numbers should not include implicit tracks in negative line number calculations.
​https://bugs.webkit.org/show_bug.cgi?id=224200

Reviewed by BJ Burg.

Use the authoredTrackColumnSizes/authoredTrackRowSizes to determine if the line is an explicit grid line or
implicit grid line (starting with the patch for bug 224199 those vectors will only contain the explicit lines).
Only explicit lines should have a negative number for addressing the line, and those numbers should start with
the last explicit line. Because each track is bounded by two lines, there will always be one more explicit line
than there is explicit track, including the case where there are no explicit tracks, which will still have a
single explicit line numbered -1.

Additionally, line numbers are now separated by an em-space to improve legibility, where previously the bullet
looked like a multiplication symbol between two numbers.

• inspector/InspectorOverlay.cpp:

(WebCore::InspectorOverlay::buildGridOverlay):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorOverlay.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-06  Patrick Angle  <pangle@apple.com>
+
+        Web Inspector: Grid overlay line numbers should not include implicit tracks in negative line number calculations.
+        https://bugs.webkit.org/show_bug.cgi?id=224200
+
+        Reviewed by BJ Burg.
+
+        Use the `authoredTrackColumnSizes`/`authoredTrackRowSizes` to determine if the line is an explicit grid line or
+        implicit grid line (starting with the patch for bug 224199 those vectors will only contain the explicit lines).
+        Only explicit lines should have a negative number for addressing the line, and those numbers should start with
+        the last explicit line. Because each track is bounded by two lines, there will always be one more explicit line
+        than there is explicit track, including the case where there are no explicit tracks, which will still have a
+        single explicit line numbered `-1`.
+
+        Additionally, line numbers are now separated by an em-space to improve legibility, where previously the bullet
+        looked like a multiplication symbol between two numbers.
+
+        * inspector/InspectorOverlay.cpp:
+        (WebCore::InspectorOverlay::buildGridOverlay):
+
 2021-04-06  Mike Gorse  <mgorse@suse.com>
 

trunk/Source/WebCore/inspector/InspectorOverlay.cpp

@@ -93 +93 @@
 static constexpr UChar multiplicationSign = 0x00D7;
 static constexpr UChar thinSpace = 0x2009;
+static constexpr UChar emSpace = 0x2003;
 
 static void truncateWithEllipsis(String& string, size_t length)
@@ -1807 +1808 @@
 
         StringBuilder lineLabel;
-        if (gridOverlay.config.showLineNumbers)
-            lineLabel.append(i + 1, thinSpace, bullet, thinSpace, -static_cast<int>(columnPositions.size() - i));
+        if (gridOverlay.config.showLineNumbers) {
+            lineLabel.append(i + 1);
+            if (i <= authoredTrackColumnSizes.size())
+                lineLabel.append(emSpace, -static_cast<int>(authoredTrackColumnSizes.size() - i + 1));
+        }
         if (gridOverlay.config.showLineNames && columnLineNames.contains(i)) {
             for (auto lineName : columnLineNames.get(i)) {
@@ -1901 +1905 @@
 
         StringBuilder lineLabel;
-        if (gridOverlay.config.showLineNumbers)
-            lineLabel.append(i + 1, thinSpace, bullet, thinSpace, -static_cast<int>(rowPositions.size() - i));
+        if (gridOverlay.config.showLineNumbers) {
+            lineLabel.append(i + 1);
+            if (i <= authoredTrackRowSizes.size())
+                lineLabel.append(emSpace, -static_cast<int>(authoredTrackRowSizes.size() - i + 1));
+        }
         if (gridOverlay.config.showLineNames && rowLineNames.contains(i)) {
             for (auto lineName : rowLineNames.get(i)) {