author | Micah Tigley <mtigley@mozilla.com> |
Tue, 10 Dec 2019 22:05:03 +0000 | |
changeset 506315 | 160a1414094801bf8bad94166d5aa6ac14a6ca3a |
parent 506314 | 7cfe8f83fb9f5b9b1ef4744092b3757fff47d652 |
child 506316 | 8b88919d7bd105f01caeab317698e21aeac707b6 |
push id | 36902 |
push user | aciure@mozilla.com |
push date | Wed, 11 Dec 2019 03:34:51 +0000 |
treeherder | mozilla-central@7635669b8d72 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mconley, bradwerth |
bugs | 1584346, 1585096 |
milestone | 73.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/devtools/client/responsive/ui.js +++ b/devtools/client/responsive/ui.js @@ -88,16 +88,18 @@ class ResponsiveUI { // Flag set when destruction has ended. this.destroyed = false; /** * A window reference for the chrome:// document that displays the responsive * design tool. It is safe to reference this window directly even with e10s, * as the tool UI is always loaded in the parent process. The web content * contained *within* the tool UI on the other hand is loaded in the child * process. + * + * TODO: we should remove this as part of Bug 1585096 */ this.toolWindow = null; // The iframe containing the RDM UI. this.rdmFrame = null; // Promise resovled when the UI init has completed. this.inited = this.init(); @@ -839,17 +841,20 @@ class ResponsiveUI { await this.inited; this.toolWindow.setViewportSize(size); } /** * Helper for tests/reloading the viewport. Assumes a single viewport for now. */ getViewportBrowser() { - return this.toolWindow.getViewportBrowser(); + if (!this.isBrowserUIEnabled) { + return this.toolWindow.getViewportBrowser(); + } + return this.tab.linkedBrowser; } /** * Helper for contacting the viewport content. Assumes a single viewport for now. */ getViewportMessageManager() { return this.getViewportBrowser().messageManager; }