firefox-devtools · gregtatum · Aug 16, 2018 · Aug 3, 2018 · Aug 3, 2018 · Aug 7, 2018
diff --git a/src/actions/profile-view.js b/src/actions/profile-view.js
@@ -654,6 +654,10 @@ export function updatePreviewSelection(
 }
 
 export function commitRange(start: number, end: number): Action {
+  if (end === start) {
+    // Ensure that the duration of the range is non-zero.
+    end = end + 0.0001;
+  }
   return {
     type: 'COMMIT_RANGE',
     start,

diff --git a/src/components/shared/MarkerTooltipContents.js b/src/components/shared/MarkerTooltipContents.js
@@ -59,7 +59,7 @@ function _markerDetailNullable<T: NotVoidOrNull>(
   value: T | void | null,
   fn: T => string = String
 ): React.Node {
-  if (value === undefined || value === null) {
+  if (value === undefined || value === null || fn(value).length === 0) {
     return null;
   }
   return _markerDetail(key, label, value, fn);
@@ -607,7 +607,7 @@ function getMarkerDetails(
       case 'Invalidation': {
         return (
           <div className="tooltipDetails">
-            {_markerDetail('url', 'URL', data.url)}
+            {_markerDetailNullable('url', 'URL', data.url)}
             {_markerDetail('line', 'Line', data.line)}
           </div>
         );

diff --git a/src/components/shared/Reorderable.js b/src/components/shared/Reorderable.js
@@ -179,7 +179,6 @@ class Reorderable extends React.PureComponent<Props, State> {
           ];
 
     this.setState({
-      phase: 'MANIPULATING',
       manipulatingIndex: elementIndex,
       manipulationDelta: 0,
       destinationIndex: elementIndex,
@@ -188,6 +187,10 @@ class Reorderable extends React.PureComponent<Props, State> {
     });
 
     const mouseMoveListener = (event: EventWithPageProperties) => {
+      if (this.state.phase === 'RESTING') {
+        // Only start manipulating on the mouse move.
+        this.setState({ phase: 'MANIPULATING' });
+      }
       const delta = clamp(
         event[xy.pageXY] - mouseDownPos,
         -spaceBefore,
@@ -199,14 +202,19 @@ class Reorderable extends React.PureComponent<Props, State> {
       });
     };
     const mouseUpListener = (event: EventWithPageProperties) => {
+      window.removeEventListener('mousemove', mouseMoveListener, true);
+      window.removeEventListener('mouseup', mouseUpListener, true);
+      if (this.state.phase === 'RESTING') {
+        // A mousemove never transitioned to the MANIPULATING state, so
+        // exit out now.
+        return;
+      }
       mouseMoveListener(event);
       const destinationIndex = this.state.destinationIndex;
       this.setState({
         phase: 'FINISHING',
         finalOffset: offsets[destinationIndex],
       });
-      window.removeEventListener('mousemove', mouseMoveListener, true);
-      window.removeEventListener('mouseup', mouseUpListener, true);
       setTimeout(() => {
         this.setState({
           phase: 'RESTING',

diff --git a/src/profile-logic/call-tree.js b/src/profile-logic/call-tree.js
@@ -195,7 +195,6 @@ export class CallTree {
       const resourceType = this._resourceTable.type[resourceIndex];
       const isJS = this._funcTable.isJS[funcIndex];
       const libName = this._getOriginAnnotation(funcIndex);
-      const precision = this._isIntegerInterval ? 0 : 1;
 
       let icon = null;
       if (resourceType === resourceTypes.webhost) {
@@ -211,7 +210,7 @@ export class CallTree {
       displayData = {
         totalTime: formatNumber(totalTime),
         selfTime: selfTime === 0 ? '—' : formatNumber(selfTime),
-        totalTimePercent: `${(100 * totalTimeRelative).toFixed(precision)}%`,
+        totalTimePercent: `${(100 * totalTimeRelative).toFixed(1)}%`,
         name: funcName,
         lib: libName,
         // Dim platform pseudo-stacks.

diff --git a/src/profile-logic/committed-ranges.js b/src/profile-logic/committed-ranges.js
@@ -26,7 +26,15 @@ export function parseCommittedRanges(
     if (!m) {
       return { start: 0, end: 1000 };
     }
-    return { start: Number(m[1]) * 1000, end: Number(m[2]) * 1000 };
+
+    const m1 = Number(m[1]);
+    let m2 = Number(m[2]);
+
+    if (m2 === m1) {
+      // Ensure that the duration of the range is non-zero.
+      m2 = m2 + 0.0001;
+    }
+    return { start: m1 * 1000, end: m2 * 1000 };
   });
 }
 

diff --git a/src/profile-logic/gecko-profile-versioning.js b/src/profile-logic/gecko-profile-versioning.js
@@ -17,7 +17,7 @@ import {
 } from './convert-markers';
 import { UniqueStringArray } from '../utils/unique-string-array';
 
-export const CURRENT_VERSION = 11; // The current version of the Gecko profile format.
+export const CURRENT_VERSION = 12; // The current version of the Gecko profile format.
 
 // Gecko profiles before version 1 did not have a profile.meta.version field.
 // Treat those as version zero.
@@ -430,5 +430,30 @@ const _upgraders = {
     }
     convertToVersionElevenRecursive(profile);
   },
+  [12]: profile => {
+    // This version will add column numbers to the JS functions and scripts.
+    // There is also a new property in the frameTable called "column" which
+    // swaps positions with the "category" property.  The new value for
+    // "category" in the frameTable schema will be 5.
+    const oldSchemaCategoryIndex = 4;
+    const newSchemaCategoryIndex = 5;
+    function convertToVersionTwelveRecursive(p) {
+      for (const thread of p.threads) {
+        const schemaIndexCategory = thread.frameTable.schema.category;
+        for (const frame of thread.frameTable.data) {
+          if (frame.hasOwnProperty(schemaIndexCategory)) {
+            frame[newSchemaCategoryIndex] = frame[oldSchemaCategoryIndex];
+            frame[oldSchemaCategoryIndex] = null;
+          }
+        }
+        thread.frameTable.schema.category = newSchemaCategoryIndex;
+        thread.frameTable.schema.column = oldSchemaCategoryIndex;
+      }
+      for (const subprocessProfile of p.processes) {
+        convertToVersionTwelveRecursive(subprocessProfile);
+      }
+    }
+    convertToVersionTwelveRecursive(profile);
+  },
 };
 /* eslint-enable no-useless-computed-key */
diff --git a/src/profile-logic/process-profile.js b/src/profile-logic/process-profile.js
@@ -500,6 +500,7 @@ function _processFrameTable(
     func: frameFuncs,
     implementation: geckoFrameStruct.implementation,
     line: geckoFrameStruct.line,
+    column: geckoFrameStruct.column,
     optimizations: geckoFrameStruct.optimizations,
     length: geckoFrameStruct.length,
   };

diff --git a/src/profile-logic/processed-profile-versioning.js b/src/profile-logic/processed-profile-versioning.js
@@ -22,7 +22,7 @@ import {
 import { UniqueStringArray } from '../utils/unique-string-array';
 import { timeCode } from '../utils/time-code';
 
-export const CURRENT_VERSION = 14; // The current version of the "processed" profile format.
+export const CURRENT_VERSION = 15; // The current version of the "processed" profile format.
 
 // Processed profiles before version 1 did not have a profile.meta.preprocessedProfileVersion
 // field. Treat those as version zero.
@@ -637,5 +637,14 @@ const _upgraders = {
       }
     }
   },
+  [15]: profile => {
+    // Profiles now have a column property in the frameTable
+    for (const thread of profile.threads) {
+      thread.frameTable.column = new Array(thread.frameTable.length);
+      for (let i = 0; i < thread.frameTable.length; i++) {
+        thread.frameTable.column[i] = null;
+      }
+    }
+  },
 };
 /* eslint-enable no-useless-computed-key */
diff --git a/src/profile-logic/profile-data.js b/src/profile-logic/profile-data.js
@@ -617,6 +617,7 @@ export function collapsePlatformStackFrames(thread: Thread): Thread {
       implementation: frameTable.implementation.slice(),
       optimizations: frameTable.optimizations.slice(),
       line: frameTable.line.slice(),
+      column: frameTable.column.slice(),
       category: frameTable.category.slice(),
       func: frameTable.func.slice(),
       address: frameTable.address.slice(),
@@ -692,6 +693,7 @@ export function collapsePlatformStackFrames(thread: Thread): Thread {
               newFrameTable.implementation.push(null);
               newFrameTable.optimizations.push(null);
               newFrameTable.line.push(null);
+              newFrameTable.column.push(null);
               newFrameTable.category.push(null);
               newFrameTable.func.push(newFuncIndex);
               newFrameTable.address.push(-1);

diff --git a/src/profile-logic/transforms.js b/src/profile-logic/transforms.js
@@ -760,6 +760,7 @@ export function collapseResource(
     func: frameTable.func.slice(),
     implementation: frameTable.implementation.slice(),
     line: frameTable.line.slice(),
+    column: frameTable.column.slice(),
     optimizations: frameTable.optimizations.slice(),
     length: frameTable.length,
   };
@@ -834,6 +835,7 @@ export function collapseResource(
             newFrameTable.category.push(frameTable.category[frameIndex]);
             newFrameTable.func.push(collapsedFuncIndex);
             newFrameTable.line.push(frameTable.line[frameIndex]);
+            newFrameTable.column.push(frameTable.column[frameIndex]);
             newFrameTable.implementation.push(
               frameTable.implementation[frameIndex]
             );