Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(881)

Unified Diff: third_party/WebKit/Source/devtools/front_end/common/SegmentedRange.js

Issue 2466123002: DevTools: reformat front-end code to match chromium style. (Closed)
Patch Set: all done Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/common/SegmentedRange.js
diff --git a/third_party/WebKit/Source/devtools/front_end/common/SegmentedRange.js b/third_party/WebKit/Source/devtools/front_end/common/SegmentedRange.js
index 212c5401dfb5022aedfc41ce3f9a772d8553fde2..be230e4d4da005fea6c056b6babec8a7b890ea3c 100644
--- a/third_party/WebKit/Source/devtools/front_end/common/SegmentedRange.js
+++ b/third_party/WebKit/Source/devtools/front_end/common/SegmentedRange.js
@@ -1,112 +1,109 @@
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-
/**
- * @constructor
- * @param {number} begin
- * @param {number} end
- * @param {*} data
+ * @unrestricted
*/
-WebInspector.Segment = function(begin, end, data)
-{
+WebInspector.Segment = class {
+ /**
+ * @param {number} begin
+ * @param {number} end
+ * @param {*} data
+ */
+ constructor(begin, end, data) {
if (begin > end)
- console.assert(false, "Invalid segment");
+ console.assert(false, 'Invalid segment');
this.begin = begin;
this.end = end;
this.data = data;
-};
+ }
-WebInspector.Segment.prototype = {
- /**
- * @param {!WebInspector.Segment} that
- * @return {boolean}
- */
- intersects: function(that)
- {
- return this.begin < that.end && that.begin < this.end;
- }
+ /**
+ * @param {!WebInspector.Segment} that
+ * @return {boolean}
+ */
+ intersects(that) {
+ return this.begin < that.end && that.begin < this.end;
+ }
};
/**
- * @constructor
- * @param {(function(!WebInspector.Segment, !WebInspector.Segment): ?WebInspector.Segment)=} mergeCallback
+ * @unrestricted
*/
-WebInspector.SegmentedRange = function(mergeCallback)
-{
+WebInspector.SegmentedRange = class {
+ /**
+ * @param {(function(!WebInspector.Segment, !WebInspector.Segment): ?WebInspector.Segment)=} mergeCallback
+ */
+ constructor(mergeCallback) {
/** @type {!Array<!WebInspector.Segment>} */
this._segments = [];
this._mergeCallback = mergeCallback;
-};
+ }
-WebInspector.SegmentedRange.prototype = {
- /**
- * @param {!WebInspector.Segment} newSegment
- */
- append: function(newSegment)
- {
- // 1. Find the proper insertion point for new segment
- var startIndex = this._segments.lowerBound(newSegment, (a, b) => a.begin - b.begin);
- var endIndex = startIndex;
- var merged = null;
- if (startIndex > 0) {
- // 2. Try mering the preceding segment
- var precedingSegment = this._segments[startIndex - 1];
- merged = this._tryMerge(precedingSegment, newSegment);
- if (merged) {
- --startIndex;
- newSegment = merged;
- } else if (this._segments[startIndex - 1].end >= newSegment.begin) {
- // 2a. If merge failed and segments overlap, adjust preceding segment.
- // If an old segment entirely contains new one, split it in two.
- if (newSegment.end < precedingSegment.end)
- this._segments.splice(startIndex, 0, new WebInspector.Segment(newSegment.end, precedingSegment.end, precedingSegment.data));
- precedingSegment.end = newSegment.begin;
- }
- }
- // 3. Consume all segments that are entirely covered by the new one.
- while (endIndex < this._segments.length && this._segments[endIndex].end <= newSegment.end)
- ++endIndex;
- // 4. Merge or adjust the succeeding segment if it overlaps.
- if (endIndex < this._segments.length) {
- merged = this._tryMerge(newSegment, this._segments[endIndex]);
- if (merged) {
- endIndex++;
- newSegment = merged;
- } else if (newSegment.intersects(this._segments[endIndex]))
- this._segments[endIndex].begin = newSegment.end;
- }
- this._segments.splice(startIndex, endIndex - startIndex, newSegment);
- },
+ /**
+ * @param {!WebInspector.Segment} newSegment
+ */
+ append(newSegment) {
+ // 1. Find the proper insertion point for new segment
+ var startIndex = this._segments.lowerBound(newSegment, (a, b) => a.begin - b.begin);
+ var endIndex = startIndex;
+ var merged = null;
+ if (startIndex > 0) {
+ // 2. Try mering the preceding segment
+ var precedingSegment = this._segments[startIndex - 1];
+ merged = this._tryMerge(precedingSegment, newSegment);
+ if (merged) {
+ --startIndex;
+ newSegment = merged;
+ } else if (this._segments[startIndex - 1].end >= newSegment.begin) {
+ // 2a. If merge failed and segments overlap, adjust preceding segment.
+ // If an old segment entirely contains new one, split it in two.
+ if (newSegment.end < precedingSegment.end)
+ this._segments.splice(
+ startIndex, 0, new WebInspector.Segment(newSegment.end, precedingSegment.end, precedingSegment.data));
+ precedingSegment.end = newSegment.begin;
+ }
+ }
+ // 3. Consume all segments that are entirely covered by the new one.
+ while (endIndex < this._segments.length && this._segments[endIndex].end <= newSegment.end)
+ ++endIndex;
+ // 4. Merge or adjust the succeeding segment if it overlaps.
+ if (endIndex < this._segments.length) {
+ merged = this._tryMerge(newSegment, this._segments[endIndex]);
+ if (merged) {
+ endIndex++;
+ newSegment = merged;
+ } else if (newSegment.intersects(this._segments[endIndex]))
+ this._segments[endIndex].begin = newSegment.end;
+ }
+ this._segments.splice(startIndex, endIndex - startIndex, newSegment);
+ }
- /**
- * @param {!WebInspector.SegmentedRange} that
- */
- appendRange: function(that)
- {
- that.segments().forEach(segment => this.append(segment));
- },
+ /**
+ * @param {!WebInspector.SegmentedRange} that
+ */
+ appendRange(that) {
+ that.segments().forEach(segment => this.append(segment));
+ }
- /**
- * @return {!Array<!WebInspector.Segment>}
- */
- segments: function()
- {
- return this._segments;
- },
+ /**
+ * @return {!Array<!WebInspector.Segment>}
+ */
+ segments() {
+ return this._segments;
+ }
- /**
- * @param {!WebInspector.Segment} first
- * @param {!WebInspector.Segment} second
- * @return {?WebInspector.Segment}
- */
- _tryMerge: function(first, second)
- {
- var merged = this._mergeCallback && this._mergeCallback(first, second);
- if (!merged)
- return null;
- merged.begin = first.begin;
- merged.end = Math.max(first.end, second.end);
- return merged;
- }
+ /**
+ * @param {!WebInspector.Segment} first
+ * @param {!WebInspector.Segment} second
+ * @return {?WebInspector.Segment}
+ */
+ _tryMerge(first, second) {
+ var merged = this._mergeCallback && this._mergeCallback(first, second);
+ if (!merged)
+ return null;
+ merged.begin = first.begin;
+ merged.end = Math.max(first.end, second.end);
+ return merged;
+ }
};

Powered by Google App Engine
This is Rietveld 408576698