Skip to content

Commit d2d68b3

Browse files
darwindarwin
committed
squash 'resources/unpacked/devtools' changes from 2342364..a5b99cb
a5b99cb [DevTools] Handle more cases for async step in markers 49ff603 force non-overlay scrollbars in all platform in flamechart 03f7c18 Revert of DevTools: format keys in object previews using sans serif. (patchset #3 id:40001 of https://codereview.chromium.org/2866363003/ ) 3ce67c1 Revert of DevTools: render product badges behind the setting. (patchset #6 id:100001 of https://codereview.chromium.org/2879943003/ ) git-subtree-dir: resources/unpacked/devtools git-subtree-split: a5b99cb
1 parent 5b401aa commit d2d68b3

22 files changed

+193
-374
lines changed

‎BUILD.gn

+1-4
Original file line numberDiff line numberDiff line change
@@ -390,11 +390,8 @@ all_devtools_files = [
390390
"front_end/persistence/PersistenceUtils.js",
391391
"front_end/platform/module.json",
392392
"front_end/platform/utilities.js",
393-
"front_end/product_registry/BadgePool.js",
394-
"front_end/product_registry/ProductRegistry.js",
395-
"front_end/product_registry/badge.css",
396393
"front_end/product_registry/module.json",
397-
"front_end/product_registry/popup.css",
394+
"front_end/product_registry/ProductRegistry.js",
398395
"front_end/product_registry_impl/module.json",
399396
"front_end/product_registry_impl/ProductRegistryImpl.js",
400397
"front_end/product_registry_impl/ProductRegistryData.js",

‎front_end/common/Color.js

-64
Original file line numberDiff line numberDiff line change
@@ -817,67 +817,3 @@ Common.Color.PageHighlight = {
817817
Shape: Common.Color.fromRGBA([96, 82, 177, 0.8]),
818818
ShapeMargin: Common.Color.fromRGBA([96, 82, 127, .6])
819819
};
820-
821-
Common.Color.Generator = class {
822-
/**
823-
* @param {!{min: number, max: number}|number=} hueSpace
824-
* @param {!{min: number, max: number, count: (number|undefined)}|number=} satSpace
825-
* @param {!{min: number, max: number, count: (number|undefined)}|number=} lightnessSpace
826-
* @param {!{min: number, max: number, count: (number|undefined)}|number=} alphaSpace
827-
*/
828-
constructor(hueSpace, satSpace, lightnessSpace, alphaSpace) {
829-
this._hueSpace = hueSpace || {min: 0, max: 360};
830-
this._satSpace = satSpace || 67;
831-
this._lightnessSpace = lightnessSpace || 80;
832-
this._alphaSpace = alphaSpace || 1;
833-
/** @type {!Map<string, string>} */
834-
this._colors = new Map();
835-
}
836-
837-
/**
838-
* @param {string} id
839-
* @param {string} color
840-
*/
841-
setColorForID(id, color) {
842-
this._colors.set(id, color);
843-
}
844-
845-
/**
846-
* @param {string} id
847-
* @return {string}
848-
*/
849-
colorForID(id) {
850-
var color = this._colors.get(id);
851-
if (!color) {
852-
color = this._generateColorForID(id);
853-
this._colors.set(id, color);
854-
}
855-
return color;
856-
}
857-
858-
/**
859-
* @param {string} id
860-
* @return {string}
861-
*/
862-
_generateColorForID(id) {
863-
var hash = String.hashCode(id);
864-
var h = this._indexToValueInSpace(hash, this._hueSpace);
865-
var s = this._indexToValueInSpace(hash >> 8, this._satSpace);
866-
var l = this._indexToValueInSpace(hash >> 16, this._lightnessSpace);
867-
var a = this._indexToValueInSpace(hash >> 24, this._alphaSpace);
868-
return `hsla(${h}, ${s}%, ${l}%, ${a})`;
869-
}
870-
871-
/**
872-
* @param {number} index
873-
* @param {!{min: number, max: number, count: (number|undefined)}|number} space
874-
* @return {number}
875-
*/
876-
_indexToValueInSpace(index, space) {
877-
if (typeof space === 'number')
878-
return space;
879-
var count = space.count || space.max - space.min;
880-
index %= count;
881-
return space.min + Math.floor(index / (count - 1) * (space.max - space.min));
882-
}
883-
};

‎front_end/inspector.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{ "name": "sources" },
2121
{ "name": "timeline", "condition": "!v8only" },
2222
{ "name": "timeline_model", "condition": "!v8only" },
23-
{ "name": "product_registry", "condition": "!v8only", "type": "autostart" },
23+
{ "name": "product_registry", "condition": "!v8only" },
2424
{ "name": "product_registry_impl", "condition": "!v8only", "type": "remote" },
2525
{ "name": "profiler" },
2626
{ "name": "resources", "condition": "!v8only" },

‎front_end/network/NetworkDataGridNode.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,9 @@ Network.NetworkRequestNode = class extends Network.NetworkNode {
361361
/** @type {?Element} */
362362
this._nameCell = null;
363363
/** @type {?Element} */
364-
this._nameBadgeElement = null;
365-
/** @type {?Element} */
366364
this._initiatorCell = null;
365+
/** @type {?Element} */
366+
this._linkifiedInitiatorAnchor = null;
367367
this._request = request;
368368
this._isNavigationRequest = false;
369369
this.selectable = true;
@@ -933,9 +933,6 @@ Network.NetworkRequestNode = class extends Network.NetworkNode {
933933
iconElement.classList.add(this._request.resourceType().name());
934934

935935
cell.appendChild(iconElement);
936-
if (!this._nameBadgeElement)
937-
this._nameBadgeElement = this.parentView().badgePool.badgeForURL(this._request.parsedURL);
938-
cell.appendChild(this._nameBadgeElement);
939936
cell.createTextChild(this._request.networkManager().target().decorateLabel(this._request.name()));
940937
this._appendSubtitle(cell, this._request.path());
941938
cell.title = this._request.url();

‎front_end/network/NetworkLogView.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ Network.NetworkLogView = class extends UI.VBox {
9090
this._currentMatchedRequestNode = null;
9191
this._currentMatchedRequestIndex = -1;
9292

93+
/** @type {!Components.Linkifier} */
9394
this.linkifier = new Components.Linkifier();
94-
this.badgePool = new ProductRegistry.BadgePool();
9595

9696
this._recording = false;
9797
this._preserveLog = false;
@@ -922,7 +922,6 @@ Network.NetworkLogView = class extends UI.VBox {
922922

923923
this._timeCalculator.setWindow(null);
924924
this.linkifier.reset();
925-
this.badgePool.reset();
926925

927926
if (this._activeGroupLookup)
928927
this._activeGroupLookup.reset();

‎front_end/network/RequestTimingView.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ Network.RequestTimingView = class extends UI.VBox {
282282
* @param {number} right
283283
*/
284284
function addTiming(serverTiming, right) {
285-
var colorGenerator = new Common.Color.Generator({min: 0, max: 360, count: 36}, {min: 50, max: 80}, 80);
285+
var colorGenerator = new PerfUI.FlameChart.ColorGenerator({min: 0, max: 360, count: 36}, {min: 50, max: 80}, 80);
286286
var isTotal = serverTiming.metric.toLowerCase() === 'total';
287287
var tr = tableElement.createChild('tr', isTotal ? 'network-timing-footer' : '');
288288
var metric = tr.createChild('td', 'network-timing-metric');

‎front_end/object_ui/ObjectPropertiesSection.js

+6-9
Original file line numberDiff line numberDiff line change
@@ -152,16 +152,16 @@ ObjectUI.ObjectPropertiesSection = class extends UI.TreeOutlineInShadow {
152152
addElements('class', textAfterPrefix, className);
153153
} else if (isAsync) {
154154
textAfterPrefix = text.substring('async function'.length);
155-
addElements('async \u0192', textAfterPrefix, nameAndArguments(textAfterPrefix));
155+
addElements('async function', textAfterPrefix, nameAndArguments(textAfterPrefix));
156156
} else if (isGenerator) {
157157
textAfterPrefix = text.substring('function*'.length);
158-
addElements('\u0192*', textAfterPrefix, nameAndArguments(textAfterPrefix));
158+
addElements('function*', textAfterPrefix, nameAndArguments(textAfterPrefix));
159159
} else if (isGeneratorShorthand) {
160160
textAfterPrefix = text.substring('*'.length);
161-
addElements('\u0192*', textAfterPrefix, nameAndArguments(textAfterPrefix));
161+
addElements('function*', textAfterPrefix, nameAndArguments(textAfterPrefix));
162162
} else if (isBasic) {
163163
textAfterPrefix = text.substring('function'.length);
164-
addElements('\u0192', textAfterPrefix, nameAndArguments(textAfterPrefix));
164+
addElements('function', textAfterPrefix, nameAndArguments(textAfterPrefix));
165165
} else if (isArrow) {
166166
const maxArrowFunctionCharacterLength = 60;
167167
var abbreviation = text;
@@ -171,7 +171,7 @@ ObjectUI.ObjectPropertiesSection = class extends UI.TreeOutlineInShadow {
171171
abbreviation = text.substring(0, firstArrowIndex + 2) + ' {\u2026}';
172172
addElements('', text, abbreviation);
173173
} else {
174-
addElements('\u0192', text, nameAndArguments(text));
174+
addElements('function', text, nameAndArguments(text));
175175
}
176176
valueElement.title = description || '';
177177
return valueElement;
@@ -738,10 +738,7 @@ ObjectUI.ObjectPropertyTreeElement = class extends UI.TreeElement {
738738
return null;
739739

740740
var valueElement = createElementWithClass('span', 'value');
741-
if (value.description === 'Object')
742-
valueElement.textContent = '';
743-
else
744-
valueElement.setTextContentTruncatedIfNeeded(value.description || '');
741+
valueElement.setTextContentTruncatedIfNeeded(value.description || '');
745742
valueElement.classList.add('object-value-' + (value.subtype || value.type));
746743
valueElement.title = value.description || '';
747744
return valueElement;

‎front_end/object_ui/RemoteObjectPreviewFormatter.js

+8-12
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,16 @@ ObjectUI.RemoteObjectPreviewFormatter = class {
4646
parentElement.createChild('span', 'object-description').textContent = text + ' ';
4747
}
4848

49-
var propertiesElement = parentElement.createChild('span', 'object-properties-preview source-code');
50-
propertiesElement.createTextChild(isArrayOrTypedArray ? '[' : '{');
49+
parentElement.createTextChild(isArrayOrTypedArray ? '[' : '{');
5150
if (preview.entries)
52-
this._appendEntriesPreview(propertiesElement, preview);
51+
this._appendEntriesPreview(parentElement, preview);
5352
else if (isArrayOrTypedArray)
54-
this._appendArrayPropertiesPreview(propertiesElement, preview);
53+
this._appendArrayPropertiesPreview(parentElement, preview);
5554
else
56-
this._appendObjectPropertiesPreview(propertiesElement, preview);
55+
this._appendObjectPropertiesPreview(parentElement, preview);
5756
if (preview.overflow)
58-
propertiesElement.createChild('span').textContent = '\u2026';
59-
propertiesElement.createTextChild(isArrayOrTypedArray ? ']' : '}');
57+
parentElement.createChild('span').textContent = '\u2026';
58+
parentElement.createTextChild(isArrayOrTypedArray ? ']' : '}');
6059
}
6160

6261
/**
@@ -223,7 +222,7 @@ ObjectUI.RemoteObjectPreviewFormatter = class {
223222
}
224223

225224
if (type === 'function') {
226-
span.textContent = '\u0192';
225+
span.textContent = 'function';
227226
return span;
228227
}
229228

@@ -238,10 +237,7 @@ ObjectUI.RemoteObjectPreviewFormatter = class {
238237
}
239238

240239
if (type === 'object' && !subtype) {
241-
var preview = this._abbreviateFullQualifiedClassName(description);
242-
if (preview === 'Object')
243-
preview = '{\u2026}';
244-
span.textContent = preview;
240+
span.textContent = this._abbreviateFullQualifiedClassName(description);
245241
span.title = description;
246242
return span;
247243
}

‎front_end/object_ui/objectPropertiesSection.css

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
* found in the LICENSE file.
55
*/
66

7+
.object-properties-section .name {
8+
color: rgb(136, 19, 145);
9+
flex-shrink: 0;
10+
}
11+
712
.object-properties-section-separator {
813
flex-shrink: 0;
914
padding-right: 5px;

‎front_end/object_ui/objectValue.css

+1-14
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
.object-value-function-prefix,
2727
.object-value-boolean {
28-
color: rgb(13, 34, 170);
28+
color: rgb(170, 13, 145);
2929
}
3030

3131
.object-value-function {
@@ -102,16 +102,3 @@
102102
.object-properties-section .object-description {
103103
color: gray;
104104
}
105-
106-
.object-properties-preview {
107-
white-space: nowrap;
108-
}
109-
110-
.name {
111-
color: rgb(136, 19, 145);
112-
flex-shrink: 0;
113-
}
114-
115-
.object-properties-preview .name {
116-
color: #565656;
117-
}

‎front_end/perf_ui/FlameChart.js

+67
Original file line numberDiff line numberDiff line change
@@ -1493,6 +1493,73 @@ PerfUI.FlameChart.Events = {
14931493
EntryHighlighted: Symbol('EntryHighlighted')
14941494
};
14951495

1496+
/**
1497+
* @unrestricted
1498+
*/
1499+
PerfUI.FlameChart.ColorGenerator = class {
1500+
/**
1501+
* @param {!{min: number, max: number}|number=} hueSpace
1502+
* @param {!{min: number, max: number, count: (number|undefined)}|number=} satSpace
1503+
* @param {!{min: number, max: number, count: (number|undefined)}|number=} lightnessSpace
1504+
* @param {!{min: number, max: number, count: (number|undefined)}|number=} alphaSpace
1505+
*/
1506+
constructor(hueSpace, satSpace, lightnessSpace, alphaSpace) {
1507+
this._hueSpace = hueSpace || {min: 0, max: 360};
1508+
this._satSpace = satSpace || 67;
1509+
this._lightnessSpace = lightnessSpace || 80;
1510+
this._alphaSpace = alphaSpace || 1;
1511+
/** @type {!Map<string, string>} */
1512+
this._colors = new Map();
1513+
}
1514+
1515+
/**
1516+
* @param {string} id
1517+
* @param {string} color
1518+
*/
1519+
setColorForID(id, color) {
1520+
this._colors.set(id, color);
1521+
}
1522+
1523+
/**
1524+
* @param {string} id
1525+
* @return {string}
1526+
*/
1527+
colorForID(id) {
1528+
var color = this._colors.get(id);
1529+
if (!color) {
1530+
color = this._generateColorForID(id);
1531+
this._colors.set(id, color);
1532+
}
1533+
return color;
1534+
}
1535+
1536+
/**
1537+
* @param {string} id
1538+
* @return {string}
1539+
*/
1540+
_generateColorForID(id) {
1541+
var hash = String.hashCode(id);
1542+
var h = this._indexToValueInSpace(hash, this._hueSpace);
1543+
var s = this._indexToValueInSpace(hash >> 8, this._satSpace);
1544+
var l = this._indexToValueInSpace(hash >> 16, this._lightnessSpace);
1545+
var a = this._indexToValueInSpace(hash >> 24, this._alphaSpace);
1546+
return `hsla(${h}, ${s}%, ${l}%, ${a})`;
1547+
}
1548+
1549+
/**
1550+
* @param {number} index
1551+
* @param {!{min: number, max: number, count: (number|undefined)}|number} space
1552+
* @return {number}
1553+
*/
1554+
_indexToValueInSpace(index, space) {
1555+
if (typeof space === 'number')
1556+
return space;
1557+
var count = space.count || space.max - space.min;
1558+
index %= count;
1559+
return space.min + Math.floor(index / (count - 1) * (space.max - space.min));
1560+
}
1561+
};
1562+
14961563
/**
14971564
* @implements {PerfUI.TimelineGrid.Calculator}
14981565
* @unrestricted

‎front_end/perf_ui/flameChart.css

+6-12
Original file line numberDiff line numberDiff line change
@@ -33,35 +33,29 @@
3333

3434
.flame-chart-v-scroll {
3535
position: absolute;
36-
top: 0;
37-
right: 0;
38-
bottom: 0;
3936
overflow-x: hidden;
4037
z-index: 200;
4138
padding-left: 1px;
39+
right: 2px;
40+
top: 3px;
41+
bottom: 3px;
4242
}
4343

4444
.flame-chart-v-scroll.always-show-scrollbar {
4545
overflow-y: scroll;
4646
}
4747

48-
:host-context(.platform-mac) .flame-chart-v-scroll {
49-
right: 2px;
50-
top: 3px;
51-
bottom: 3px;
52-
}
53-
5448
/* force non-overlay scrollbars */
55-
:host-context(.platform-mac) ::-webkit-scrollbar {
49+
::-webkit-scrollbar {
5650
width: 8px;
5751
}
5852

59-
:host-context(.platform-mac) ::-webkit-scrollbar-thumb {
53+
::-webkit-scrollbar-thumb {
6054
background-color: hsla(0, 0%, 56%, 0.6);
6155
border-radius: 50px;
6256
}
6357

64-
:host-context(.platform-mac) .flame-chart-v-scroll:hover::-webkit-scrollbar-thumb {
58+
.flame-chart-v-scroll:hover::-webkit-scrollbar-thumb {
6559
background-color: hsla(0, 0%, 25%, 0.6);
6660
}
6761

0 commit comments

Comments
 (0)