1340750 - Fix sidebar remote browser handling

Status: RESOLVED FIXED

(WebExtensions :: General, defect)

Description

[Shane Caraveo (:mixedpuppy)]

Switching the browser to a remote browser was not correct and spitting out a couple errors.

Comment 1

[Shane Caraveo (:mixedpuppy)]

Attachment: Bug 1340750 fix remote handling of sidebar browser,

Review commit: https://reviewboard.mozilla.org/r/113626/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/113626/

Comment 2

[Shane Caraveo (:mixedpuppy)]

Comment on attachment 8838810 [details]
Bug 1340750 fix remote handling of sidebar browser,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/113626/diff/1-2/

Comment 3

[Kris Maglione [:kmag]]

Comment on attachment 8838810 [details]
Bug 1340750 fix remote handling of sidebar browser,

https://reviewboard.mozilla.org/r/113626/#review115676

::: browser/base/content/webext-panels.js:36
(Diff revision 2)
> +
> +  let readyPromise;
> +  if (sidebar.remote) {
>      browser.setAttribute("remote", "true");
> -    browser.setAttribute("remoteType", remoteType);
> +    browser.setAttribute("remoteType", E10SUtils.getRemoteTypeForURI(sidebar.uri, true,
> +                                                 E10SUtils.EXTENSION_REMOTE_TYPE));

Nit: Weird indentation.

::: browser/base/content/webext-panels.js:39
(Diff revision 2)
>      browser.setAttribute("remote", "true");
> -    browser.setAttribute("remoteType", remoteType);
> +    browser.setAttribute("remoteType", E10SUtils.getRemoteTypeForURI(sidebar.uri, true,
> +                                                 E10SUtils.EXTENSION_REMOTE_TYPE));
> +    readyPromise = promiseEvent(browser, "XULFrameLoaderCreated");
>    } else {
> -    browser.removeAttribute("remote");
> +    readyPromise = promiseEvent(browser, "load");

This generally shouldn't be necessary.

::: browser/base/content/webext-panels.js:44
(Diff revision 2)
> -}
> +  }
> +  document.documentElement.appendChild(browser);
>  
> -function load() {
> +  return readyPromise.then(() => {
> -  let browser = document.getElementById("webext-panels-browser");
> -  browser.messageManager.loadFrameScript("chrome://browser/content/content.js", true);
> +    browser.messageManager.loadFrameScript("chrome://browser/content/content.js", true);

s/true/false/, please.

Comment 4

[Shane Caraveo (:mixedpuppy)]

Comment on attachment 8838810 [details]
Bug 1340750 fix remote handling of sidebar browser,

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/113626/diff/2-3/

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/6d18f9e14d5d
fix remote handling of sidebar browser, r=kmag

Comment 6

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/6d18f9e14d5d