Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Firefox addon: Use isContentWindowPrivate instead of isWindowPrivate if available #5364

Merged
merged 1 commit into from
Oct 1, 2014

Conversation

Rob--W
Copy link
Member

@Rob--W Rob--W commented Sep 30, 2014

As of Firefox 35, PrivateBrowsingUtilsisContentWindowPrivate should be used for DOM windows instead of PrivateBrowsingUtils.isWindowPrivate. See https://bugzilla.mozilla.org/show_bug.cgi?id=1069059 and http://hg.mozilla.org/mozilla-central/diff/324798b60ba3/toolkit/modules/PrivateBrowsingUtils.jsm

Without this fix, you will get the following error message when Firefox+PDF.js is started:

WARNING: content window passed to PrivateBrowsingUtils.isWindowPrivate. Use isContentWindowPrivate instead (but only for frame scripts).
pbu_isWindowPrivate@resource://gre/modules/PrivateBrowsingUtils.jsm:25:14
ChromeActions.prototype.isInPrivateBrowsing@resource://pdf.js/PdfStreamConverter.jsm:237:12
xhr_onreadystatechange@resource://pdf.js/PdfStreamConverter.jsm:545:30
NetworkManager_requestRange@resource://pdf.js/network.js:95:7
NetworkManager_requestRange@resource://pdf.js/network.js:81:14
RangedChromeActions_requestDataRange@resource://pdf.js/PdfStreamConverter.jsm:596:1
RequestListener.prototype.receive@resource://pdf.js/PdfStreamConverter.jsm:705:5
PdfStreamConverter.prototype.onStartRequest/proxy.onStopRequest/<@resource://pdf.js/PdfStreamConverter.jsm:909:11
FirefoxComClosure/<.request@resource://pdf.js/web/viewer.js:529:14
PdfDataRangeTransport_requestDataRange@resource://pdf.js/web/viewer.js:2977:9
transportDataRange@resource://pdf.js/build/pdf.js:2122:13
messageHandlerComObjOnMessage@resource://pdf.js/build/pdf.js:1219:9

@Rob--W Rob--W changed the title addon: isContentWindowPrivate -> isWindowPrivate Firefox addon: Use isContentWindowPrivate instead of isWindowPrivate if available Sep 30, 2014
@Rob--W Rob--W force-pushed the firefox-pbu_isWindowPrivate branch from a78e9f9 to 8c411e4 Compare September 30, 2014 16:21
@timvandermeij
Copy link
Contributor

Looks good to me. @yurydelendik Could you also review this?

@yurydelendik
Copy link
Contributor

Can you invert logic to check on non-existence of the method and call older version, and strip that for mozilla central?

//#if !(MOZCENTRAL)
 if (!PrivateBrowsingUtils.isContentWindowPrivate) {
 // As of Firefox 35 (bug 1069059)
 return PrivateBrowsingUtils.isWindowPrivate(this.domWindow);
 }
//#endif
 return PrivateBrowsingUtils.isContentWindowPrivate(this.domWindow);

As of Firefox 35, isContentWindowPrivate should be used for DOM windows instead of isWindowPrivate.
See https://bugzilla.mozilla.org/show_bug.cgi?id=1069059 and
http://hg.mozilla.org/mozilla-central/diff/324798b60ba3/toolkit/modules/PrivateBrowsingUtils.jsm

Without this fix, you will get the following error message when Firefox+PDF.js is started:
>
WARNING: content window passed to PrivateBrowsingUtils.isWindowPrivate. Use isContentWindowPrivate instead (but only for frame scripts).
pbu_isWindowPrivate@resource://gre/modules/PrivateBrowsingUtils.jsm:25:14
ChromeActions.prototype.isInPrivateBrowsing@resource://pdf.js/PdfStreamConverter.jsm:237:12
xhr_onreadystatechange@resource://pdf.js/PdfStreamConverter.jsm:545:30
NetworkManager_requestRange@resource://pdf.js/network.js:95:7
NetworkManager_requestRange@resource://pdf.js/network.js:81:14
RangedChromeActions_requestDataRange@resource://pdf.js/PdfStreamConverter.jsm:596:1
RequestListener.prototype.receive@resource://pdf.js/PdfStreamConverter.jsm:705:5
PdfStreamConverter.prototype.onStartRequest/proxy.onStopRequest/<@resource://pdf.js/PdfStreamConverter.jsm:909:11
FirefoxComClosure/<.request@resource://pdf.js/web/viewer.js:529:14
PdfDataRangeTransport_requestDataRange@resource://pdf.js/web/viewer.js:2977:9
transportDataRange@resource://pdf.js/build/pdf.js:2122:13
messageHandlerComObjOnMessage@resource://pdf.js/build/pdf.js:1219:9
@Rob--W Rob--W force-pushed the firefox-pbu_isWindowPrivate branch from 8c411e4 to 4fe92f6 Compare October 1, 2014 21:50
@Rob--W
Copy link
Member Author

Rob--W commented Oct 1, 2014

@yurydelendik Done.

@yurydelendik
Copy link
Contributor

awesome! thank you

/botio-windows preview

@pdfjsbot
Copy link

pdfjsbot commented Oct 1, 2014

From: Bot.io (Windows)


Received

Command cmd_preview from @yurydelendik received. Current queue size: 0

Live output at: http://107.22.172.223:8877/0bc0bf80ec83f73/output.txt

yurydelendik added a commit that referenced this pull request Oct 1, 2014
Firefox addon: Use isContentWindowPrivate instead of isWindowPrivate if available
@yurydelendik yurydelendik merged commit 56d11fc into mozilla:master Oct 1, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants