Skip to content

Commit 3ae2d94

Browse files
committed
merge updates from official devtools
2 parents ac4dec8 + ab8449a commit 3ae2d94

File tree

15 files changed

+366
-137
lines changed

15 files changed

+366
-137
lines changed

resources/unpacked/devtools/front_end/application_test_runner/ServiceWorkersTestRunner.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ ApplicationTestRunner.waitForServiceWorker = function(callback) {
4343
ApplicationTestRunner.dumpServiceWorkersView = function() {
4444
var swView = UI.panels.resources.visibleView;
4545

46-
return swView._reportView._sectionList.childTextNodes()
46+
return swView._currentWorkersView._sectionList.childTextNodes()
47+
.concat(swView._otherWorkersView._sectionList.childTextNodes())
4748
.map(function(node) {
4849
return node.textContent.replace(/Received.*/, 'Received').replace(/#\d+/, '#N');
4950
})

resources/unpacked/devtools/front_end/common/ParsedURL.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ Common.ParsedURL = class {
158158
*/
159159
static extractName(url) {
160160
var index = url.lastIndexOf('/');
161-
return index !== -1 ? url.substr(index + 1) : url;
161+
var pathAndQuery = index !== -1 ? url.substr(index + 1) : url;
162+
index = pathAndQuery.indexOf('?');
163+
return index < 0 ? pathAndQuery : pathAndQuery.substr(0, index);
162164
}
163165

164166
/**

resources/unpacked/devtools/front_end/console/ConsoleViewMessage.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,12 +595,17 @@ Console.ConsoleViewMessage = class {
595595
note.classList.add('info-note');
596596
note.title = Common.UIString('Value below was evaluated just now.');
597597

598-
var section = new ObjectUI.ObjectPropertiesSection(obj, titleElement, this._linkifier);
598+
var section = new ObjectUI.ObjectPropertiesSection(
599+
obj, titleElement, this._linkifier, undefined, undefined, undefined, this._onObjectChange.bind(this));
599600
section.element.classList.add('console-view-object-properties-section');
600601
section.enableContextMenu();
601602
return section.element;
602603
}
603604

605+
_onObjectChange() {
606+
// This method is sniffed in tests.
607+
}
608+
604609
/**
605610
* @param {!SDK.RemoteObject} func
606611
* @param {boolean=} includePreview

0 commit comments

Comments
 (0)