diff --git a/content/browser/devtools/OWNERS b/content/browser/devtools/OWNERS index de8aa6e5108503..6f34e236d0abe4 100644 --- a/content/browser/devtools/OWNERS +++ b/content/browser/devtools/OWNERS @@ -1,6 +1,6 @@ caseq@chromium.org alph@chromium.org -per-file *background_services*=rayankans@chromium.org +per-file *background_service*=rayankans@chromium.org # COMPONENT: Platform>DevTools diff --git a/third_party/blink/renderer/devtools/front_end/resources/BackgroundServiceView.js b/third_party/blink/renderer/devtools/front_end/resources/BackgroundServiceView.js index 7a65f4b6d9b32c..45456bc595aee5 100644 --- a/third_party/blink/renderer/devtools/front_end/resources/BackgroundServiceView.js +++ b/third_party/blink/renderer/devtools/front_end/resources/BackgroundServiceView.js @@ -234,7 +234,7 @@ Resources.BackgroundServiceView = class extends UI.VBox { swScope = registration.scopeURL.substr(registration.securityOrigin.length); return { - id: this._dataGrid.rootNode().children.length, + id: this._dataGrid.rootNode().children.length + 1, timestamp: UI.formatTimestamp(serviceEvent.timestamp * 1000, /* full= */ true), origin: serviceEvent.origin, swScope, @@ -339,7 +339,7 @@ Resources.BackgroundServiceView.EventDataNode = class extends DataGrid.DataGridN super(data); /** @const {!Array} */ - this._eventMetadata = eventMetadata; + this._eventMetadata = eventMetadata.sort((m1, m2) => m1.key.compareTo(m2.key)); } /** diff --git a/third_party/blink/web_tests/http/tests/devtools/background-services/background-service-grid-expected.txt b/third_party/blink/web_tests/http/tests/devtools/background-services/background-service-grid-expected.txt index 49d10a6a4bfd69..3fdd75b34bff54 100644 --- a/third_party/blink/web_tests/http/tests/devtools/background-services/background-service-grid-expected.txt +++ b/third_party/blink/web_tests/http/tests/devtools/background-services/background-service-grid-expected.txt @@ -3,16 +3,16 @@ Tests that the grid shows information as expected. Grid Entries: [empty] Grid Entries: - 0, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] + 1, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] Grid Entries: - 0, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] + 1, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] Grid Entries: - 0, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] + 1, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] Grid Entries: - 0, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] - 1, 1556889085000, Event2, http://127.0.0.1:8080/, [blank], Instance1, [blank] + 1, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] + 2, 1556889085000, Event2, http://127.0.0.1:8080/, [blank], Instance1, [blank] Grid Entries: - 0, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] + 1, 1556889085000, Event1, http://127.0.0.1:8000/, [blank], Instance1, [blank] Grid Entries: [empty]