tbb-commits June 2019

tbb-commits@lists.torproject.org

2 participants
39 discussions

[tor-browser-build/master] Bug 30863: Fix tor-android-service and tor-onion-proxy-library filenames
by gk＠torproject.org 26 Jun '19

26 Jun '19

commit a27f6be9a921119cb5e7869da9b891c359651bda Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Jun 12 12:03:54 2019 +0200 Bug 30863: Fix tor-android-service and tor-onion-proxy-library filenames --- projects/tor-android-service/config | 2 +- projects/tor-onion-proxy-library/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 2290c6e..ec0d4b0 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' git_hash: d9b049c8cee225b4e7bb6f0191093f543d0f9f65 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 9db33bd..0f24402 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' git_hash: 27df20a5cb107a009db009df4aaef000a6e78e2e git_url: https://github.com/sisbell/Tor_Onion_Proxy_Library.git git_submodule: 1

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30863'
by gk＠torproject.org 26 Jun '19

26 Jun '19

commit b4414487740039152a8fa62dde5d8ea13aa34cb2 Merge: 343b8bc a27f6be Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jun 26 12:18:28 2019 +0000 Merge remote-tracking branch 'boklm/bug_30863' projects/tor-android-service/config | 2 +- projects/tor-onion-proxy-library/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit b512c194bccfab64c3d27065b4d2e535f53ba979 Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Wed Jun 19 21:59:18 2019 +0000 Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D35371 --HG-- extra : source : bfd88bfc61c42a09475da8749b2218f540e4592c --- browser/modules/RemotePrompt.jsm | 14 +++++++++----- toolkit/components/prompts/src/nsPrompter.js | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/modules/RemotePrompt.jsm b/browser/modules/RemotePrompt.jsm index 45755c2446fc..f94052410d5c 100644 --- a/browser/modules/RemotePrompt.jsm +++ b/browser/modules/RemotePrompt.jsm @@ -23,10 +23,14 @@ var RemotePrompt = { receiveMessage(message) { switch (message.name) { case "Prompt:Open": - if (message.data.uri) { - this.openModalWindow(message.data, message.target); - } else { + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + if (message.data.tabPrompt) { this.openTabPrompt(message.data, message.target); + } else { + let uri = (message.data.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; + this.openModalWindow(uri, message.data, message.target); } break; } @@ -90,13 +94,13 @@ var RemotePrompt = { } }, - openModalWindow(args, browser) { + openModalWindow(uri, args, browser) { let window = browser.ownerGlobal; try { PromptUtils.fireDialogEvent(window, "DOMWillOpenModalDialog", browser); let bag = PromptUtils.objectToPropBag(args); - Services.ww.openWindow(window, args.uri, "_blank", + Services.ww.openWindow(window, uri, "_blank", "centerscreen,chrome,modal,titlebar", bag); PromptUtils.propBagToObject(bag, args); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index bf76cd8b2078..77a65b25b100 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -430,7 +430,7 @@ function openTabPrompt(domWin, tabPrompt, args) { } } -function openRemotePrompt(domWin, args, tabPrompt) { +function openRemotePrompt(domWin, args) { let docShell = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDocShell); let messageManager = docShell.QueryInterface(Ci.nsIInterfaceRequestor) @@ -438,7 +438,7 @@ function openRemotePrompt(domWin, args, tabPrompt) { .messageManager; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; - let eventDetail = Cu.cloneInto({tabPrompt, inPermitUnload}, domWin); + let eventDetail = Cu.cloneInto({tabPrompt: args.tabPrompt, inPermitUnload}, domWin); PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) @@ -536,7 +536,8 @@ ModalPrompter.prototype = { if (allowTabModal && this.domWin) { if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - openRemotePrompt(this.domWin, args, true); + args.tabPrompt = true; + openRemotePrompt(this.domWin, args); return; } @@ -548,17 +549,16 @@ ModalPrompter.prototype = { } // If we can't do a tab modal prompt, fallback to using a window-modal dialog. - const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; - const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; - - let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; - if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { - args.uri = uri; + args.tabPrompt = false; openRemotePrompt(this.domWin, args); return; } + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; let propBag = PromptUtils.objectToPropBag(args); openModalWindow(this.domWin, uri, propBag); PromptUtils.propBagToObject(propBag, args);

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 1544386 part 1 - Call ElementAccessHasExtraIndexedProperty instead of ArrayPrototypeHasIndexedProperty when inlining array natives. r=tcampbell a=lizzard
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 84dcecbb38bfda010f1c093f6c74776363e05593 Author: Jan de Mooij <jdemooij(a)mozilla.com> Date: Mon Jun 17 20:26:56 2019 -0700 Bug 1544386 part 1 - Call ElementAccessHasExtraIndexedProperty instead of ArrayPrototypeHasIndexedProperty when inlining array natives. r=tcampbell a=lizzard This simplifies the code a bit because ElementAccessHasExtraIndexedProperty checks for length-overflow and sparse-indexes so the callers don't have to do that anymore. Differential Revision: https://phabricator.services.mozilla.com/D29486 --HG-- extra : amend_source : 545208ea4a5e0646837959eace9b527620a8f7ba --- js/src/jit/MCallOptimize.cpp | 21 +++++---------------- js/src/jit/MIR.cpp | 9 --------- js/src/jit/MIR.h | 2 -- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/js/src/jit/MCallOptimize.cpp b/js/src/jit/MCallOptimize.cpp index 6f4764313b93..fe10f48b0323 100644 --- a/js/src/jit/MCallOptimize.cpp +++ b/js/src/jit/MCallOptimize.cpp @@ -673,9 +673,10 @@ IonBuilder::InliningResult IonBuilder::inlineArrayPopShift( return InliningStatus_NotInlined; } + // Watch out for extra indexed properties on the object or its prototype. bool hasIndexedProperty; MOZ_TRY_VAR(hasIndexedProperty, - ArrayPrototypeHasIndexedProperty(this, script())); + ElementAccessHasExtraIndexedProperty(this, obj)); if (hasIndexedProperty) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; @@ -775,16 +776,10 @@ IonBuilder::InliningResult IonBuilder::inlineArrayPush(CallInfo& callInfo) { if (!thisTypes) return InliningStatus_NotInlined; const Class* clasp = thisTypes->getKnownClass(constraints()); if (clasp != &ArrayObject::class_) return InliningStatus_NotInlined; - if (thisTypes->hasObjectFlags( - constraints(), - OBJECT_FLAG_SPARSE_INDEXES | OBJECT_FLAG_LENGTH_OVERFLOW)) { - trackOptimizationOutcome(TrackedOutcome::ArrayBadFlags); - return InliningStatus_NotInlined; - } bool hasIndexedProperty; MOZ_TRY_VAR(hasIndexedProperty, - ArrayPrototypeHasIndexedProperty(this, script())); + ElementAccessHasExtraIndexedProperty(this, obj)); if (hasIndexedProperty) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; @@ -903,17 +898,11 @@ IonBuilder::InliningResult IonBuilder::inlineArraySlice(CallInfo& callInfo) { const Class* clasp = thisTypes->getKnownClass(constraints()); if (clasp != &ArrayObject::class_) return InliningStatus_NotInlined; - if (thisTypes->hasObjectFlags( - constraints(), - OBJECT_FLAG_SPARSE_INDEXES | OBJECT_FLAG_LENGTH_OVERFLOW)) { - trackOptimizationOutcome(TrackedOutcome::ArrayBadFlags); - return InliningStatus_NotInlined; - } - // Watch out for indexed properties on the prototype. + // Watch out for extra indexed properties on the object or its prototype. bool hasIndexedProperty; MOZ_TRY_VAR(hasIndexedProperty, - ArrayPrototypeHasIndexedProperty(this, script())); + ElementAccessHasExtraIndexedProperty(this, obj)); if (hasIndexedProperty) { trackOptimizationOutcome(TrackedOutcome::ProtoIndexedProps); return InliningStatus_NotInlined; diff --git a/js/src/jit/MIR.cpp b/js/src/jit/MIR.cpp index 4d37c264ae18..87b78b24e09b 100644 --- a/js/src/jit/MIR.cpp +++ b/js/src/jit/MIR.cpp @@ -5671,15 +5671,6 @@ AbortReasonOr<bool> PrototypeHasIndexedProperty(IonBuilder* builder, return false; } -// Whether Array.prototype, or an object on its proto chain, has an indexed -// property. -AbortReasonOr<bool> jit::ArrayPrototypeHasIndexedProperty(IonBuilder* builder, - JSScript* script) { - if (JSObject* proto = script->global().maybeGetArrayPrototype()) - return PrototypeHasIndexedProperty(builder, proto); - return true; -} - // Whether obj or any of its prototypes have an indexed property. AbortReasonOr<bool> jit::TypeCanHaveExtraIndexedProperties( IonBuilder* builder, TemporaryTypeSet* types) { diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index 85b8afff445c..b45eaba68222 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -12575,8 +12575,6 @@ bool PropertyWriteNeedsTypeBarrier(TempAllocator& alloc, PropertyName* name, MDefinition** pvalue, bool canModify, MIRType implicitType = MIRType::None); -AbortReasonOr<bool> ArrayPrototypeHasIndexedProperty(IonBuilder* builder, - JSScript* script); AbortReasonOr<bool> TypeCanHaveExtraIndexedProperties(IonBuilder* builder, TemporaryTypeSet* types);

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-1] Bug 30575: Don't allow enterprise policies in Tor Browser
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 9d582e62e32ee8143fd638744f2f5f0f49c28ca3 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jun 7 11:49:06 2019 +0000 Bug 30575: Don't allow enterprise policies in Tor Browser --- .../enterprisepolicies/EnterprisePolicies.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/browser/components/enterprisepolicies/EnterprisePolicies.js b/browser/components/enterprisepolicies/EnterprisePolicies.js index 20cc33628f2a..4bab7d000ab0 100644 --- a/browser/components/enterprisepolicies/EnterprisePolicies.js +++ b/browser/components/enterprisepolicies/EnterprisePolicies.js @@ -78,20 +78,10 @@ EnterprisePoliciesManager.prototype = { _xpcom_factory: EnterprisePoliciesFactory, _initialize() { - let provider = this._chooseProvider(); - - if (!provider) { - this.status = Ci.nsIEnterprisePolicies.INACTIVE; - return; - } - - if (provider.failed) { - this.status = Ci.nsIEnterprisePolicies.FAILED; - return; - } - - this.status = Ci.nsIEnterprisePolicies.ACTIVE; - this._activatePolicies(provider.policies); + // We don't want to have any enterprise policies in Tor Browser enabled as + // those can affect proxy settings etc. See: e.g. #30575. + this.status = Ci.nsIEnterprisePolicies.INACTIVE; + return; }, _chooseProvider() {

1 0

[tor-browser-build/master] Pick up the second chemspill as well
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 343b8bc4e9208e9b412cfb9227fa26449bc8458a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 14:08:48 2019 +0000 Pick up the second chemspill as well --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 9d548cd..20c5b0f 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 851cc5e..b03054b 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,6 @@ -Tor Browser 9.0a3 -- June 20 2019 +Tor Browser 9.0a3 -- June 24 2019 * All platforms - * Pick up fix for Mozilla's bug 1544386 + * Pick up fixes for Mozilla's bug 1544386 and 1560192 * Update NoScript to 10.6.3 * Bug 29904: NoScript blocks MP4 on higher security levels * Bug 30624+29043+29647: Prevent XSS protection from freezing the browser diff --git a/rbm.conf b/rbm.conf index 8e90615..657ce31 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.0a3' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.0a2 project_name: tor-browser

1 0

[tor-browser/tor-browser-60.7.0esr-9.0-2] Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit df852fdc7f75aa7edddbaf1b54eea3484a552414 Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Wed Jun 19 21:59:18 2019 +0000 Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D35371 --HG-- extra : source : bfd88bfc61c42a09475da8749b2218f540e4592c --- browser/modules/RemotePrompt.jsm | 14 +++++++++----- toolkit/components/prompts/src/nsPrompter.js | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/modules/RemotePrompt.jsm b/browser/modules/RemotePrompt.jsm index 45755c2446fc..f94052410d5c 100644 --- a/browser/modules/RemotePrompt.jsm +++ b/browser/modules/RemotePrompt.jsm @@ -23,10 +23,14 @@ var RemotePrompt = { receiveMessage(message) { switch (message.name) { case "Prompt:Open": - if (message.data.uri) { - this.openModalWindow(message.data, message.target); - } else { + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + if (message.data.tabPrompt) { this.openTabPrompt(message.data, message.target); + } else { + let uri = (message.data.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; + this.openModalWindow(uri, message.data, message.target); } break; } @@ -90,13 +94,13 @@ var RemotePrompt = { } }, - openModalWindow(args, browser) { + openModalWindow(uri, args, browser) { let window = browser.ownerGlobal; try { PromptUtils.fireDialogEvent(window, "DOMWillOpenModalDialog", browser); let bag = PromptUtils.objectToPropBag(args); - Services.ww.openWindow(window, args.uri, "_blank", + Services.ww.openWindow(window, uri, "_blank", "centerscreen,chrome,modal,titlebar", bag); PromptUtils.propBagToObject(bag, args); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index bf76cd8b2078..77a65b25b100 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -430,7 +430,7 @@ function openTabPrompt(domWin, tabPrompt, args) { } } -function openRemotePrompt(domWin, args, tabPrompt) { +function openRemotePrompt(domWin, args) { let docShell = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDocShell); let messageManager = docShell.QueryInterface(Ci.nsIInterfaceRequestor) @@ -438,7 +438,7 @@ function openRemotePrompt(domWin, args, tabPrompt) { .messageManager; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; - let eventDetail = Cu.cloneInto({tabPrompt, inPermitUnload}, domWin); + let eventDetail = Cu.cloneInto({tabPrompt: args.tabPrompt, inPermitUnload}, domWin); PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) @@ -536,7 +536,8 @@ ModalPrompter.prototype = { if (allowTabModal && this.domWin) { if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - openRemotePrompt(this.domWin, args, true); + args.tabPrompt = true; + openRemotePrompt(this.domWin, args); return; } @@ -548,17 +549,16 @@ ModalPrompter.prototype = { } // If we can't do a tab modal prompt, fallback to using a window-modal dialog. - const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; - const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; - - let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; - if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { - args.uri = uri; + args.tabPrompt = false; openRemotePrompt(this.domWin, args); return; } + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; let propBag = PromptUtils.objectToPropBag(args); openModalWindow(this.domWin, uri, propBag); PromptUtils.propBagToObject(propBag, args);

1 0

[tor-browser-build/maint-8.5] A Changelog would be good as well
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit 9024841d836d737b2372a6535e3cf2d9761c46cd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 04:26:32 2019 +0000 A Changelog would be good as well --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 317bb1f..8763d44 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 8.5.3 -- June 21 2019 + * All platforms + * Pick up fix for Mozilla's bug 1560192 + Tor Browser 8.5.2 -- June 19 2019 * All platforms * Pick up fix for Mozilla's bug 1544386 diff --git a/rbm.conf b/rbm.conf index 6c60049..060686b 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '8.5.3' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 8.5.1 - 8.5.2

1 0

[tor-browser-build/maint-8.5] Release prep for 8.5.3
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit aaff2ce4348a6511ba672286bbb6619a2fc50dde Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 20 04:15:37 2019 +0000 Release prep for 8.5.3 --- projects/firefox/config | 2 +- rbm.conf | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index e95ccbd..be222a5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 651bf98..6c60049 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '8.5.2' + torbrowser_version: '8.5.3' torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5.1 + - 8.5.2 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-60.7.0esr-8.5-2] Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc
by gk＠torproject.org 20 Jun '19

20 Jun '19

commit e7f025ee58e2ba638fd9e5eae549bdc2b3644ccc Author: Johann Hofmann <jhofmann(a)mozilla.com> Date: Wed Jun 19 21:59:18 2019 +0000 Bug 1560192 - Clean up prompt open calls in Prompter.jsm. r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D35371 --HG-- extra : source : bfd88bfc61c42a09475da8749b2218f540e4592c --- browser/modules/RemotePrompt.jsm | 14 +++++++++----- toolkit/components/prompts/src/nsPrompter.js | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/modules/RemotePrompt.jsm b/browser/modules/RemotePrompt.jsm index 45755c2446fc..f94052410d5c 100644 --- a/browser/modules/RemotePrompt.jsm +++ b/browser/modules/RemotePrompt.jsm @@ -23,10 +23,14 @@ var RemotePrompt = { receiveMessage(message) { switch (message.name) { case "Prompt:Open": - if (message.data.uri) { - this.openModalWindow(message.data, message.target); - } else { + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + if (message.data.tabPrompt) { this.openTabPrompt(message.data, message.target); + } else { + let uri = (message.data.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; + this.openModalWindow(uri, message.data, message.target); } break; } @@ -90,13 +94,13 @@ var RemotePrompt = { } }, - openModalWindow(args, browser) { + openModalWindow(uri, args, browser) { let window = browser.ownerGlobal; try { PromptUtils.fireDialogEvent(window, "DOMWillOpenModalDialog", browser); let bag = PromptUtils.objectToPropBag(args); - Services.ww.openWindow(window, args.uri, "_blank", + Services.ww.openWindow(window, uri, "_blank", "centerscreen,chrome,modal,titlebar", bag); PromptUtils.propBagToObject(bag, args); diff --git a/toolkit/components/prompts/src/nsPrompter.js b/toolkit/components/prompts/src/nsPrompter.js index bf76cd8b2078..77a65b25b100 100644 --- a/toolkit/components/prompts/src/nsPrompter.js +++ b/toolkit/components/prompts/src/nsPrompter.js @@ -430,7 +430,7 @@ function openTabPrompt(domWin, tabPrompt, args) { } } -function openRemotePrompt(domWin, args, tabPrompt) { +function openRemotePrompt(domWin, args) { let docShell = domWin.QueryInterface(Ci.nsIInterfaceRequestor) .getInterface(Ci.nsIDocShell); let messageManager = docShell.QueryInterface(Ci.nsIInterfaceRequestor) @@ -438,7 +438,7 @@ function openRemotePrompt(domWin, args, tabPrompt) { .messageManager; let inPermitUnload = docShell.contentViewer && docShell.contentViewer.inPermitUnload; - let eventDetail = Cu.cloneInto({tabPrompt, inPermitUnload}, domWin); + let eventDetail = Cu.cloneInto({tabPrompt: args.tabPrompt, inPermitUnload}, domWin); PromptUtils.fireDialogEvent(domWin, "DOMWillOpenModalDialog", null, eventDetail); let winUtils = domWin.QueryInterface(Ci.nsIInterfaceRequestor) @@ -536,7 +536,8 @@ ModalPrompter.prototype = { if (allowTabModal && this.domWin) { if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_CONTENT) { - openRemotePrompt(this.domWin, args, true); + args.tabPrompt = true; + openRemotePrompt(this.domWin, args); return; } @@ -548,17 +549,16 @@ ModalPrompter.prototype = { } // If we can't do a tab modal prompt, fallback to using a window-modal dialog. - const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; - const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; - - let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; - if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_CONTENT) { - args.uri = uri; + args.tabPrompt = false; openRemotePrompt(this.domWin, args); return; } + const COMMON_DIALOG = "chrome://global/content/commonDialog.xul"; + const SELECT_DIALOG = "chrome://global/content/selectDialog.xul"; + + let uri = (args.promptType == "select") ? SELECT_DIALOG : COMMON_DIALOG; let propBag = PromptUtils.objectToPropBag(args); openModalWindow(this.domWin, uri, propBag); PromptUtils.propBagToObject(propBag, args);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits June 2019