diff options
Diffstat (limited to 'chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing')
6 files changed, 137 insertions, 109 deletions
diff --git a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/about_tracing.html b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/about_tracing.html index 1df923b4d42..8e579d90921 100644 --- a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/about_tracing.html +++ b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/about_tracing.html @@ -4,6 +4,8 @@ Copyright (c) 2013 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. --> +<link rel="import" href="/tracing/ui/base/base.html" data-suppress-import-order> + <link rel="stylesheet" href="/tracing/ui/extras/about_tracing/common.css"> <link rel="import" href="/tracing/ui/extras/about_tracing/profiling_view.html"> <link rel="import" href="/tracing/ui/extras/full_config.html"> @@ -16,7 +18,7 @@ tr.exportTo('tr.ui.e.about_tracing', function() { document.addEventListener('DOMContentLoaded', function() { window.profilingView = new tr.ui.e.about_tracing.ProfilingView(); profilingView.timelineView.globalMode = true; - document.body.appendChild(profilingView); + Polymer.dom(document.body).appendChild(profilingView); }); return {}; diff --git a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/profiling_view.html b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/profiling_view.html index accff574c54..58d4e913e34 100644 --- a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/profiling_view.html +++ b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/profiling_view.html @@ -69,31 +69,33 @@ tr.exportTo('tr.ui.e.about_tracing', function() { /** * ProfilingView * @constructor - * @extends {HTMLUnknownElement} + * @extends {HTMLDivElement} */ var ProfilingView = tr.ui.b.define('x-profiling-view'); var THIS_DOC = document.currentScript.ownerDocument; ProfilingView.prototype = { - __proto__: HTMLUnknownElement.prototype, + __proto__: HTMLDivElement.prototype, decorate: function(tracingControllerClient) { - this.appendChild(tr.ui.b.instantiateTemplate('#profiling-view-template', - THIS_DOC)); + Polymer.dom(this).appendChild( + tr.ui.b.instantiateTemplate('#profiling-view-template', THIS_DOC)); - this.timelineView_ = this.querySelector('tr-ui-timeline-view'); - this.infoBarGroup_ = this.querySelector('tr-ui-b-info-bar-group'); + this.timelineView_ = + Polymer.dom(this).querySelector('tr-ui-timeline-view'); + this.infoBarGroup_ = + Polymer.dom(this).querySelector('tr-ui-b-info-bar-group'); // Detach the buttons. We will reattach them to the timeline view. // TODO(nduca): Make timeline-view have a content select="x-buttons" // that pulls in any buttons. - this.recordButton_ = this.querySelector('#record-button'); - this.loadButton_ = this.querySelector('#load-button'); - this.saveButton_ = this.querySelector('#save-button'); + this.recordButton_ = Polymer.dom(this).querySelector('#record-button'); + this.loadButton_ = Polymer.dom(this).querySelector('#load-button'); + this.saveButton_ = Polymer.dom(this).querySelector('#save-button'); - var buttons = this.querySelector('x-timeline-view-buttons'); - buttons.parentElement.removeChild(buttons); - this.timelineView_.leftControls.appendChild(buttons); + var buttons = Polymer.dom(this).querySelector('x-timeline-view-buttons'); + Polymer.dom(buttons.parentElement).removeChild(buttons); + Polymer.dom(this.timelineView_.leftControls).appendChild(buttons); this.initButtons_(); this.timelineView_.hotkeyController.addHotKey(new tr.ui.b.HotKey({ diff --git a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_controller.html b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_controller.html index 2284b0fa3e7..a72ddfeba07 100644 --- a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_controller.html +++ b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_controller.html @@ -72,18 +72,18 @@ tr.exportTo('tr.ui.e.about_tracing', function() { var bufferPercentFullDiv; function startTracing() { progressDlg = new tr.ui.b.Overlay(); - progressDlg.textContent = 'Recording...'; + Polymer.dom(progressDlg).textContent = 'Recording...'; progressDlg.userCanClose = false; bufferPercentFullDiv = document.createElement('div'); - progressDlg.appendChild(bufferPercentFullDiv); + Polymer.dom(progressDlg).appendChild(bufferPercentFullDiv); var stopButton = document.createElement('button'); - stopButton.textContent = 'Stop'; + Polymer.dom(stopButton).textContent = 'Stop'; progressDlg.clickStopButton = function() { stopButton.click(); }; - progressDlg.appendChild(stopButton); + Polymer.dom(progressDlg).appendChild(stopButton); var recordingOptions = { categoryFilter: selectionDlg.categoryFilter(), @@ -141,21 +141,21 @@ tr.exportTo('tr.ui.e.about_tracing', function() { updateBufferPercentFull); } - function updateBufferPercentFull(percent_full) { + function updateBufferPercentFull(percentFull) { if (!bufferPercentFullDiv) return; - percent_full = Math.round(100 * parseFloat(percent_full)); - var newText = 'Buffer usage: ' + percent_full + '%'; - if (bufferPercentFullDiv.textContent != newText) - bufferPercentFullDiv.textContent = newText; + percentFull = Math.round(100 * parseFloat(percentFull)); + var newText = 'Buffer usage: ' + percentFull + '%'; + if (Polymer.dom(bufferPercentFullDiv).textContent !== newText) + Polymer.dom(bufferPercentFullDiv).textContent = newText; window.setTimeout(getBufferPercentFull, 500); } // Thats it! We're done. return finalPromise; - }; + } function endRecording(tracingControllerClient) { return tracingControllerClient.endRecording(); diff --git a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_selection_dialog.html b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_selection_dialog.html index 79ce154dba8..71a333bf60d 100644 --- a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_selection_dialog.html +++ b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_selection_dialog.html @@ -29,6 +29,7 @@ found in the LICENSE file. max-width: 0; opacity: 0; overflow: hidden; + display: none; } .categories-selection { @@ -228,24 +229,25 @@ tr.exportTo('tr.ui.e.about_tracing', function() { tr.ui.b.Overlay.prototype.decorate.call(this); this.title = 'Record a new trace...'; - this.classList.add('record-dialog-overlay'); + Polymer.dom(this).classList.add('record-dialog-overlay'); var node = tr.ui.b.instantiateTemplate('#record-selection-dialog-template', THIS_DOC); - this.appendChild(node); + Polymer.dom(this).appendChild(node); this.recordButtonEl_ = document.createElement('button'); - this.recordButtonEl_.textContent = 'Record'; + Polymer.dom(this.recordButtonEl_).textContent = 'Record'; this.recordButtonEl_.addEventListener( 'click', this.onRecordButtonClicked_.bind(this)); this.recordButtonEl_.style.fontSize = '110%'; - this.buttons.appendChild(this.recordButtonEl_); + Polymer.dom(this.buttons).appendChild(this.recordButtonEl_); - this.categoriesView_ = this.querySelector('.categories-column-view'); - this.presetsEl_ = this.querySelector('.category-presets'); - this.presetsEl_.appendChild(tr.ui.b.createOptionGroup( + this.categoriesView_ = Polymer.dom(this).querySelector( + '.categories-column-view'); + this.presetsEl_ = Polymer.dom(this).querySelector('.category-presets'); + Polymer.dom(this.presetsEl_).appendChild(tr.ui.b.createOptionGroup( this, 'currentlyChosenPreset', 'about_tracing.record_selection_dialog_preset', DEFAULT_PRESETS[0].categoryFilter, @@ -266,30 +268,37 @@ tr.exportTo('tr.ui.e.about_tracing', function() { undefined, undefined, 'recordSelectionDialog.useSampling', DEFAULT_SAMPLING_TRACING, 'State sampling'); - this.tracingModesContainerEl_ = this.querySelector('.tracing-modes'); - this.tracingModesContainerEl_.appendChild(this.tracingRecordModeSltr_); - this.tracingModesContainerEl_.appendChild(this.systemTracingBn_); - this.tracingModesContainerEl_.appendChild(this.samplingTracingBn_); - + this.tracingModesContainerEl_ = Polymer.dom(this).querySelector( + '.tracing-modes'); + Polymer.dom(this.tracingModesContainerEl_).appendChild( + this.tracingRecordModeSltr_); + Polymer.dom(this.tracingModesContainerEl_).appendChild( + this.systemTracingBn_); + Polymer.dom(this.tracingModesContainerEl_).appendChild( + this.samplingTracingBn_); this.enabledCategoriesContainerEl_ = - this.querySelector('.default-enabled-categories .categories'); + Polymer.dom(this).querySelector( + '.default-enabled-categories .categories'); this.disabledCategoriesContainerEl_ = - this.querySelector('.default-disabled-categories .categories'); + Polymer.dom(this).querySelector( + '.default-disabled-categories .categories'); this.createGroupSelectButtons_( - this.querySelector('.default-enabled-categories')); + Polymer.dom(this).querySelector('.default-enabled-categories')); this.createGroupSelectButtons_( - this.querySelector('.default-disabled-categories')); + Polymer.dom(this).querySelector('.default-disabled-categories')); this.createDefaultDisabledWarningDialog_( - this.querySelector('.warning-default-disabled-categories')); + Polymer.dom(this).querySelector( + '.warning-default-disabled-categories')); this.editCategoriesOpened_ = false; // TODO(chrishenry): When used with tr.ui.b.Overlay (such as in // chrome://tracing, this does not yet look quite right due to // the 10px overlay content padding (but it's good enough). - this.infoBarGroup_ = this.querySelector('tr-ui-b-info-bar-group'); + this.infoBarGroup_ = Polymer.dom(this).querySelector( + 'tr-ui-b-info-bar-group'); this.addEventListener('visible-change', this.onVisibleChange_.bind(this)); }, @@ -370,7 +379,7 @@ tr.exportTo('tr.ui.e.about_tracing', function() { }, updateManualSelectionView_: function() { - var classList = this.categoriesView_.classList; + var classList = Polymer.dom(this.categoriesView_).classList; if (!this.usingPreset_()) { classList.remove('categories-column-view-hidden'); } else { @@ -382,7 +391,7 @@ tr.exportTo('tr.ui.e.about_tracing', function() { }, updateCategoryColumnView_: function(shouldReadFromSettings) { - var categorySet = this.querySelectorAll('.categories'); + var categorySet = Polymer.dom(this).querySelectorAll('.categories'); for (var i = 0; i < categorySet.length; ++i) { var categoryGroup = categorySet[i].children; for (var j = 0; j < categoryGroup.length; ++j) { @@ -415,26 +424,31 @@ tr.exportTo('tr.ui.e.about_tracing', function() { }, changeEditCategoriesState_: function(editCategoriesState) { - var presetOptionsGroup = this.querySelector('.labeled-option-group'); + var presetOptionsGroup = Polymer.dom(this).querySelector( + '.labeled-option-group'); if (!presetOptionsGroup) return; this.editCategoriesOpened_ = editCategoriesState; if (this.editCategoriesOpened_) - presetOptionsGroup.classList.add('categories-expanded'); + Polymer.dom(presetOptionsGroup).classList.add('categories-expanded'); else - presetOptionsGroup.classList.remove('categories-expanded'); + Polymer.dom(presetOptionsGroup).classList.remove( + 'categories-expanded'); }, updatePresetDescription_: function() { - var description = this.querySelector('.category-description'); + var description = Polymer.dom(this).querySelector( + '.category-description'); if (this.usingPreset_()) { description.innerText = this.currentlyChosenPreset_; - description.classList.remove('category-description-hidden'); + Polymer.dom(description).classList.remove( + 'category-description-hidden'); } else { description.innerText = ''; - if (!description.classList.contains('category-description-hidden')) - description.classList.add('category-description-hidden'); + if (!Polymer.dom(description).classList.contains( + 'category-description-hidden')) + Polymer.dom(description).classList.add('category-description-hidden'); } }, @@ -443,7 +457,7 @@ tr.exportTo('tr.ui.e.about_tracing', function() { var categories = []; var allCategories = this.allCategories_(); for (var category in allCategories) { - var disabled = category.indexOf('disabled-by-default-') == 0; + var disabled = category.indexOf('disabled-by-default-') === 0; if (this.currentlyChosenPreset_.indexOf(category) >= 0) { if (disabled) categories.push(category); @@ -456,17 +470,17 @@ tr.exportTo('tr.ui.e.about_tracing', function() { } var categories = this.unselectedCategories_(); - var categories_length = categories.length; - var negated_categories = []; - for (var i = 0; i < categories_length; ++i) { + var categoriesLength = categories.length; + var negatedCategories = []; + for (var i = 0; i < categoriesLength; ++i) { // Skip any category with a , as it will cause issues when we negate. // Both sides should have been added as separate categories, these can // only come from settings. if (categories[i].match(/,/)) continue; - negated_categories.push('-' + categories[i]); + negatedCategories.push('-' + categories[i]); } - categories = negated_categories.join(','); + categories = negatedCategories.join(','); var disabledCategories = this.enabledDisabledByDefaultCategories_(); disabledCategories = disabledCategories.join(','); @@ -490,9 +504,9 @@ tr.exportTo('tr.ui.e.about_tracing', function() { }, collectInputs_: function(inputs, isChecked) { - var inputs_length = inputs.length; + var inputsLength = inputs.length; var categories = []; - for (var i = 0; i < inputs_length; ++i) { + for (var i = 0; i < inputsLength; ++i) { var input = inputs[i]; if (input.checked === isChecked) categories.push(input.value); @@ -502,13 +516,15 @@ tr.exportTo('tr.ui.e.about_tracing', function() { unselectedCategories_: function() { var inputs = - this.enabledCategoriesContainerEl_.querySelectorAll('input'); + Polymer.dom(this.enabledCategoriesContainerEl_).querySelectorAll( + 'input'); return this.collectInputs_(inputs, false); }, enabledDisabledByDefaultCategories_: function() { var inputs = - this.disabledCategoriesContainerEl_.querySelectorAll('input'); + Polymer.dom(this.disabledCategoriesContainerEl_).querySelectorAll( + 'input'); return this.collectInputs_(inputs, true); }, @@ -518,8 +534,8 @@ tr.exportTo('tr.ui.e.about_tracing', function() { }, buildInputs_: function(inputs, checkedDefault, parent) { - var inputs_length = inputs.length; - for (var i = 0; i < inputs_length; i++) { + var inputsLength = inputs.length; + for (var i = 0; i < inputsLength; i++) { var category = inputs[i]; var inputEl = document.createElement('input'); @@ -532,14 +548,15 @@ tr.exportTo('tr.ui.e.about_tracing', function() { inputEl.onclick = this.updateSetting_.bind(this); var labelEl = document.createElement('label'); - labelEl.textContent = category.replace('disabled-by-default-', ''); - labelEl.setAttribute('for', category); + Polymer.dom(labelEl).textContent = + category.replace('disabled-by-default-', ''); + Polymer.dom(labelEl).setAttribute('for', category); var divEl = document.createElement('div'); - divEl.appendChild(inputEl); - divEl.appendChild(labelEl); + Polymer.dom(divEl).appendChild(inputEl); + Polymer.dom(divEl).appendChild(labelEl); - parent.appendChild(divEl); + Polymer.dom(parent).appendChild(divEl); } }, @@ -560,8 +577,9 @@ tr.exportTo('tr.ui.e.about_tracing', function() { return a.toLowerCase().localeCompare(b.toLowerCase()); } - this.enabledCategoriesContainerEl_.innerHTML = ''; // Clear old categories - this.disabledCategoriesContainerEl_.innerHTML = ''; + // Clear old categories + Polymer.dom(this.enabledCategoriesContainerEl_).innerHTML = ''; + Polymer.dom(this.disabledCategoriesContainerEl_).innerHTML = ''; this.recordButtonEl_.focus(); @@ -569,7 +587,7 @@ tr.exportTo('tr.ui.e.about_tracing', function() { var categories = []; var disabledCategories = []; for (var category in allCategories) { - if (category.indexOf('disabled-by-default-') == 0) + if (category.indexOf('disabled-by-default-') === 0) disabledCategories.push(category); else categories.push(category); @@ -577,7 +595,7 @@ tr.exportTo('tr.ui.e.about_tracing', function() { disabledCategories = disabledCategories.sort(ignoreCaseCompare); categories = categories.sort(ignoreCaseCompare); - if (this.categories_.length == 0) { + if (this.categories_.length === 0) { this.infoBarGroup_.addMessage( 'No categories found; recording will use default categories.'); } @@ -603,15 +621,16 @@ tr.exportTo('tr.ui.e.about_tracing', function() { var categoryEl = this.querySelector( '#category-preset-Manually-select-settings'); categoryEl.checked = true; - var description = this.querySelector('.category-description'); + var description = Polymer.dom(this).querySelector( + '.category-description'); description.innerText = ''; - description.classList.add('category-description-hidden'); + Polymer.dom(description).classList.add('category-description-hidden'); } }, createGroupSelectButtons_: function(parent) { var flipInputs = function(dir) { - var inputs = parent.querySelectorAll('input'); + var inputs = Polymer.dom(parent).querySelectorAll('input'); for (var i = 0; i < inputs.length; i++) { if (inputs[i].checked === dir) continue; @@ -621,13 +640,13 @@ tr.exportTo('tr.ui.e.about_tracing', function() { } }; - var allBtn = parent.querySelector('.all-btn'); + var allBtn = Polymer.dom(parent).querySelector('.all-btn'); allBtn.onclick = function(evt) { flipInputs(true); evt.preventDefault(); }; - var noneBtn = parent.querySelector('.none-btn'); + var noneBtn = Polymer.dom(parent).querySelector('.none-btn'); noneBtn.onclick = function(evt) { flipInputs(false); evt.preventDefault(); @@ -639,11 +658,11 @@ tr.exportTo('tr.ui.e.about_tracing', function() { for (var i = 0; i < messages.length; ++i) { var messageDiv = document.createElement('div'); - messageDiv.textContent = messages[i]; - contentDiv.appendChild(messageDiv); + Polymer.dom(messageDiv).textContent = messages[i]; + Polymer.dom(contentDiv).appendChild(messageDiv); } - this.warningOverlay_.textContent = ''; - this.warningOverlay_.appendChild(contentDiv); + Polymer.dom(this.warningOverlay_).textContent = ''; + Polymer.dom(this.warningOverlay_).appendChild(contentDiv); }, createDefaultDisabledWarningDialog_: function(warningLink) { diff --git a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_selection_dialog_test.html b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_selection_dialog_test.html index 1142f6e6035..7dfc4e0a7cf 100644 --- a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_selection_dialog_test.html +++ b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/record_selection_dialog_test.html @@ -15,7 +15,7 @@ found in the LICENSE file. tr.b.unittest.testSuite(function() { test('instantitate', function() { var showButton = document.createElement('button'); - showButton.textContent = 'Show record selection dialog'; + Polymer.dom(showButton).textContent = 'Show record selection dialog'; this.addHTMLOutput(showButton); showButton.addEventListener('click', function(e) { @@ -49,7 +49,7 @@ tr.b.unittest.testSuite(function() { var expected = ['"cc"', '"cc.debug"', '"disabled-by-default-one"', '"three"', '"two"']; - var labels = dlg.querySelectorAll('.categories input'); + var labels = Polymer.dom(dlg).querySelectorAll('.categories input'); var results = []; for (var i = 0; i < labels.length; i++) { results.push('"' + labels[i].value + '"'); @@ -66,7 +66,7 @@ tr.b.unittest.testSuite(function() { dlg.currentlyChosenPreset = []; dlg.updateForm_(); - var checkboxes = dlg.querySelectorAll('.categories input'); + var checkboxes = Polymer.dom(dlg).querySelectorAll('.categories input'); assert.equal(checkboxes.length, 3); assert.equal(checkboxes[0].id, 'three'); assert.equal(checkboxes[0].value, 'three'); @@ -80,11 +80,11 @@ tr.b.unittest.testSuite(function() { assert.equal(dlg.categoryFilter(), ''); - var labels = dlg.querySelectorAll('.categories label'); + var labels = Polymer.dom(dlg).querySelectorAll('.categories label'); assert.equal(labels.length, 3); - assert.equal(labels[0].textContent, 'three'); - assert.equal(labels[1].textContent, 'two'); - assert.equal(labels[2].textContent, 'one'); + assert.equal(Polymer.dom(labels[0]).textContent, 'three'); + assert.equal(Polymer.dom(labels[1]).textContent, 'two'); + assert.equal(Polymer.dom(labels[2]).textContent, 'one'); }); test('recordSelectionDialog_UpdateForm_Settings', function() { @@ -97,7 +97,7 @@ tr.b.unittest.testSuite(function() { dlg.currentlyChosenPreset = []; dlg.updateForm_(); - var checkboxes = dlg.querySelectorAll('.categories input'); + var checkboxes = Polymer.dom(dlg).querySelectorAll('.categories input'); assert.equal(checkboxes.length, 3); assert.equal(checkboxes[0].id, 'three'); assert.equal(checkboxes[0].value, 'three'); @@ -111,11 +111,11 @@ tr.b.unittest.testSuite(function() { assert.equal(dlg.categoryFilter(), '-three'); - var labels = dlg.querySelectorAll('.categories label'); + var labels = Polymer.dom(dlg).querySelectorAll('.categories label'); assert.equal(labels.length, 3); - assert.equal(labels[0].textContent, 'three'); - assert.equal(labels[1].textContent, 'two'); - assert.equal(labels[2].textContent, 'one'); + assert.equal(Polymer.dom(labels[0]).textContent, 'three'); + assert.equal(Polymer.dom(labels[1]).textContent, 'two'); + assert.equal(Polymer.dom(labels[2]).textContent, 'one'); }); test('recordSelectionDialog_UpdateForm_DisabledByDefault', function() { @@ -128,7 +128,7 @@ tr.b.unittest.testSuite(function() { assert.equal(dlg.categoryFilter(), ''); var inputs = - dlg.querySelector('input#disabled-by-default-bar').click(); + Polymer.dom(dlg).querySelector('input#disabled-by-default-bar').click(); assert.equal(dlg.categoryFilter(), 'disabled-by-default-bar'); @@ -158,27 +158,32 @@ tr.b.unittest.testSuite(function() { dlg.updateForm_(); // Enables the three option, two already enabled. - dlg.querySelector('.default-enabled-categories .all-btn').click(); + Polymer.dom(dlg).querySelector('.default-enabled-categories .all-btn') + .click(); assert.equal(dlg.categoryFilter(), ''); assert.isTrue(tr.b.Settings.get('three', false, 'categories')); // Disables three and two. - dlg.querySelector('.default-enabled-categories .none-btn').click(); + Polymer.dom(dlg).querySelector('.default-enabled-categories .none-btn') + .click(); assert.equal(dlg.categoryFilter(), '-three,-two'); assert.isFalse(tr.b.Settings.get('two', false, 'categories')); assert.isFalse(tr.b.Settings.get('three', false, 'categories')); // Turn categories back on so they can be ignored. - dlg.querySelector('.default-enabled-categories .all-btn').click(); + Polymer.dom(dlg).querySelector('.default-enabled-categories .all-btn') + .click(); // Enables disabled category. - dlg.querySelector('.default-disabled-categories .all-btn').click(); + Polymer.dom(dlg).querySelector('.default-disabled-categories .all-btn') + .click(); assert.equal(dlg.categoryFilter(), 'disabled-by-default-one'); assert.isTrue( tr.b.Settings.get('disabled-by-default-one', false, 'categories')); // Turn disabled by default back off. - dlg.querySelector('.default-disabled-categories .none-btn').click(); + Polymer.dom(dlg).querySelector('.default-disabled-categories .none-btn') + .click(); assert.equal(dlg.categoryFilter(), ''); assert.isFalse( tr.b.Settings.get('disabled-by-default-one', false, 'categories')); @@ -209,11 +214,11 @@ tr.b.unittest.testSuite(function() { assert.isFalse(dlg.useSampling); // Make sure the manual settings are not visible. - var classList = dlg.categoriesView_.classList; + var classList = Polymer.dom(dlg.categoriesView_).classList; assert.isTrue(classList.contains('categories-column-view-hidden')); // Verify manual settings do not modify the checkboxes. - var checkboxes = dlg.querySelectorAll('.categories input'); + var checkboxes = Polymer.dom(dlg).querySelectorAll('.categories input'); assert.equal(checkboxes.length, 3); assert.equal(checkboxes[0].id, 'three'); assert.equal(checkboxes[0].value, 'three'); @@ -297,7 +302,7 @@ tr.b.unittest.testSuite(function() { assert.isFalse(dlg.useSampling); // Make sure the manual settings are not visible. - var classList = dlg.categoriesView_.classList; + var classList = Polymer.dom(dlg.categoriesView_).classList; assert.isTrue(classList.contains('categories-column-view-hidden')); // Switch to manual settings and verify the default values are not returned. @@ -346,7 +351,7 @@ tr.b.unittest.testSuite(function() { assert.isTrue(dlg.useSampling); // Make sure the manual settings are not visible. - var classList = dlg.categoriesView_.classList; + var classList = Polymer.dom(dlg.categoriesView_).classList; assert.isTrue(classList.contains('categories-column-view-hidden')); // Switch to manual settings and verify the default values are not returned. diff --git a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html index c7c68cc8483..a33e614813e 100644 --- a/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html +++ b/chromium/third_party/catapult/tracing/tracing/ui/extras/about_tracing/xhr_based_tracing_controller_client.html @@ -20,13 +20,13 @@ tr.exportTo('tr.ui.e.about_tracing', function() { data = null; return new Promise(function(resolve, reject) { var req = new XMLHttpRequest(); - if (method != 'POST' && data !== null) + if (method !== 'POST' && data !== null) throw new Error('Non-POST should have data==null'); req.open(method, path, true); req.onreadystatechange = function(e) { - if (req.readyState == 4) { + if (req.readyState === 4) { window.setTimeout(function() { - if (req.status == 200 && req.responseText != '##ERROR##') { + if (req.status === 200 && req.responseText !== '##ERROR##') { resolve(req.responseText); } else { reject(new Error('Error occured at ' + path)); @@ -58,8 +58,8 @@ tr.exportTo('tr.ui.e.about_tracing', function() { captureMonitoring: function() { return beginXhr('GET', '/json/capture_monitoring_compressed').then( function(data) { - var decoded_size = Base64.getDecodedBufferLength(data); - var buffer = new ArrayBuffer(decoded_size); + var decodedSize = Base64.getDecodedBufferLength(data); + var buffer = new ArrayBuffer(decodedSize); Base64.DecodeToTypedArray(data, new DataView(buffer)); return buffer; } @@ -93,8 +93,8 @@ tr.exportTo('tr.ui.e.about_tracing', function() { endRecording: function() { return beginXhr('GET', '/json/end_recording_compressed').then( function(data) { - var decoded_size = Base64.getDecodedBufferLength(data); - var buffer = new ArrayBuffer(decoded_size); + var decodedSize = Base64.getDecodedBufferLength(data); + var buffer = new ArrayBuffer(decodedSize); Base64.DecodeToTypedArray(data, new DataView(buffer)); return buffer; } |