DevTools: Audits2 use location.href when available

third_party/WebKit/Source/devtools/front_end/audits2/Audits2Panel.js

 // Copyright (c) 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.
 
 /**
  * @unrestricted
  */
 Audits2.Audits2Panel = class extends UI.PanelWithSidebar {
   constructor() {
     super('audits2');
@@ skipping 124 matching lines @@
    * @return {!Element}
    */
   _createStatusView(launcherUIElement) {
     var statusView = launcherUIElement.createChild('div', 'audits2-status vbox hidden');
     this._statusIcon = statusView.createChild('div', 'icon');
     this._statusElement = statusView.createChild('div');
     this._updateStatus(Common.UIString('Loading...'));
     return statusView;
   }
 
+  _updateInspectedURL() {

[dgozman, 2017/05/22 18:50:34]

JSDoc please.

[phulce, 2017/05/22 19:10:16]

Done.

+    var mainTarget = SDK.targetManager.mainTarget();
+    var runtimeModel = /** @type {!SDK.RuntimeModel} */ (mainTarget.model(SDK.RuntimeModel));

[dgozman, 2017/05/22 18:50:34]

No need to cast, instead do the following in next line:

var executionContext = runtimeModel && runtimeModel.defaultExecutionContext();

[phulce, 2017/05/22 19:10:16]

Done.

+    var executionContext = runtimeModel.defaultExecutionContext();
+    if (!executionContext) {
+      this.inspectedURL = mainTarget.inspectedURL();

[caseq, 2017/05/22 18:53:06]

did you mean _inspectedURL?

[phulce, 2017/05/22 19:10:16]

whoops, yes :)

+      return;
+    }
+
+    return new Promise((resolve, reject) => {

[dgozman, 2017/05/22 18:50:34]

We don't usually reject promises.

[phulce, 2017/05/22 19:10:16]

Gotcha, so we have a general preference to silently recover with partial data
rather than fail loudly?

+      executionContext.evaluate('window.location.href', 'audits', false, false, true, false, false, (object, err) => {
+        if (err || !object)
+          return reject(err || new Error('Failed to retrieve page URL'));

[dgozman, 2017/05/22 18:50:34]

Just resolve with mainTarget.inspectedURL()

[phulce, 2017/05/22 19:10:16]

Done.

+        this._inspectedURL = object.value;
+        resolve();
+      });
+    });
+  }
+
   _start() {
     var emulationModel = self.singleton(Emulation.DeviceModeModel);
     this._emulationEnabledBefore = emulationModel.enabledSetting().get();
     this._emulationOutlineEnabledBefore = emulationModel.deviceOutlineSetting().get();
     emulationModel.enabledSetting().set(true);
     emulationModel.deviceOutlineSetting().set(true);
     emulationModel.toolbarControlsEnabledSetting().set(false);
 
     for (var device of Emulation.EmulatedDevicesList.instance().standard()) {
       if (device.title === 'Nexus 5X')
         emulationModel.emulate(Emulation.DeviceModeModel.Type.Device, device, device.modes[0], 1);
     }
     this._dialog.setCloseOnEscape(false);
-    this._inspectedURL = SDK.targetManager.mainTarget().inspectedURL();
 
     var categoryIDs = [];
     for (var preset of Audits2.Audits2Panel.Presets) {
       if (preset.setting.get())
         categoryIDs.push(preset.configID);
     }
 
     return Promise.resolve()
+        .then(_ => this._updateInspectedURL())
         .then(_ => this._protocolService.attach())
         .then(_ => {
           this._auditRunning = true;
           this._updateButton();
           this._updateStatus(Common.UIString('Loading\u2026'));
         })
         .then(_ => this._protocolService.startLighthouse(this._inspectedURL, categoryIDs))
         .then(lighthouseResult => {
           if (lighthouseResult && lighthouseResult.fatal) {
             const error = new Error(lighthouseResult.message);
@@ skipping 480 matching lines @@
           return;
 
         var element = Components.DOMPresentationUtils.linkifyNodeReference(node, undefined, detailsItem.snippet);
         origElement.title = '';
         origElement.textContent = '';
         origElement.appendChild(element);
       });
     });
   }
 };