merge mozilla-inbound to mozilla-central a=merge (18101914) · Commits · The Tor Project / Applications / Tor Browser

browser/base/content/test/general/browser.ini

+2 −1

Original line number	Diff line number	Diff line
		@@ -332,6 +332,7 @@ skip-if = e10s # Bug 863514 - no gesture support.
		[browser_homeDrop.js]
		skip-if = buildapp == 'mulet'
		[browser_identity_UI.js]
		skip-if = e10s && debug # Seeing lots of timeouts (bug 1095517)
		[browser_keywordBookmarklets.js]
		skip-if = e10s # Bug 1102025 - different principals for the bookmarklet only in e10s mode (unclear if test or 'real' issue)
		[browser_keywordSearch.js]
		@@ -421,7 +422,7 @@ skip-if = e10s \|\| os == 'linux' # Bug 1093373, bug 1104755
		[browser_tab_drag_drop_perwindow.js]
		skip-if = buildapp == 'mulet'
		[browser_tab_dragdrop.js]
		skip-if = buildapp == 'mulet'
		skip-if = buildapp == 'mulet' \|\| (e10s && debug) # Bug 1150036: In e10s, content process crashes, main process leaks!
		[browser_tab_dragdrop2.js]
		skip-if = buildapp == 'mulet'
		[browser_tabbar_big_widgets.js]

browser/base/content/test/social/browser.ini

+3 −0

Original line number	Diff line number	Diff line
		@@ -29,7 +29,9 @@ support-files =
		[browser_aboutHome_activation.js]
		skip-if = e10s # Bug 1053965 "cw.ensureSnippetsMapThen is not a function", also see general/browser.ini about:home comments
		[browser_addons.js]
		skip-if = e10s && debug # Leaking docshells (bug 1150147)
		[browser_blocklist.js]
		skip-if = e10s && debug # Leaking docshells (bug 1150147)
		[browser_share.js]
		skip-if = true # bug 1115131
		[browser_social_activation.js]
		@@ -45,6 +47,7 @@ skip-if = e10s # Bug 1072669 context menu relies on target element
		skip-if = e10s # when we backed out bug 1047603, this test broke.
		[browser_social_isVisible.js]
		[browser_social_marks.js]
		skip-if = e10s && debug # Leaking docshells (bug 1150147)
		[browser_social_multiprovider.js]
		skip-if = e10s # Bug 1069162 - lots of orange
		[browser_social_multiworker.js]

browser/base/content/urlbarBindings.xml

+20 −15

Original line number	Diff line number	Diff line
		<?xml version="1.0"?>

		# -- Mode: HTML --
		# This Source Code Form is subject to the terms of the Mozilla Public
		# License, v. 2.0. If a copy of the MPL was not distributed with this
		# file, You can obtain one at http://mozilla.org/MPL/2.0/.
		<!--
		-- Mode: HTML --
		This Source Code Form is subject to the terms of the Mozilla Public
		License, v. 2.0. If a copy of the MPL was not distributed with this
		file, You can obtain one at http://mozilla.org/MPL/2.0/.
		-->

		<!DOCTYPE bindings [
		<!ENTITY % notificationDTD SYSTEM "chrome://global/locale/notification.dtd">
		@@ -49,6 +51,9 @@
		</content>

		<implementation implements="nsIObserver, nsIDOMEventListener">
		<field name="AppConstants" readonly="true">
		(Components.utils.import("resource://gre/modules/AppConstants.jsm", {})).AppConstants;
		</field>
		<constructor><![CDATA[
		this._prefs = Components.classes["@mozilla.org/preferences-service;1"]
		.getService(Components.interfaces.nsIPrefService)
		@@ -403,11 +408,9 @@
		// and only if we get a keyboard event, to match user expectations.
		if (/^\s[^.:\/\s]+(?:\/.\|\s*)$/i.test(url) &&
		(aTriggeringEvent instanceof KeyEvent)) {
		#ifdef XP_MACOSX
		let accel = aTriggeringEvent.metaKey;
		#else
		let accel = aTriggeringEvent.ctrlKey;
		#endif
		let accel = this.AppConstants.platform == "macosx" ?
		aTriggeringEvent.metaKey :
		aTriggeringEvent.ctrlKey;
		let shift = aTriggeringEvent.shiftKey;

		let suffix = "";
		@@ -937,6 +940,10 @@
		<!-- Note: this binding is applied to the autocomplete popup used in the Search bar and in web page content -->
		<binding id="browser-autocomplete-result-popup" extends="chrome://global/content/bindings/autocomplete.xml#autocomplete-result-popup">
		<implementation>
		<field name="AppConstants" readonly="true">
		(Components.utils.import("resource://gre/modules/AppConstants.jsm", {})).AppConstants;
		</field>

		<method name="openAutocompletePopup">
		<parameter name="aInput"/>
		<parameter name="aElement"/>
		@@ -989,13 +996,11 @@
		var where = whereToOpenLink(aEvent, false, true);

		// But open ctrl/cmd clicks on autocomplete items in a new background tab.
		let modifier = this.AppConstants.platform == "macosx" ?
		aEvent.metaKey :
		aEvent.ctrlKey;
		if (where == "tab" && (aEvent instanceof MouseEvent) &&
		(aEvent.button == 1 \|\|
		#ifdef XP_MACOSX
		aEvent.metaKey))
		#else
		aEvent.ctrlKey))
		#endif
		(aEvent.button == 1 \|\| modifier))
		where = "tab-background";

		searchBar.doSearch(search, where);

browser/base/jar.mn

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ browser.jar:
		content/browser/searchSuggestionUI.css (content/searchSuggestionUI.css)
		content/browser/tabbrowser.css (content/tabbrowser.css)
		content/browser/tabbrowser.xml (content/tabbrowser.xml)
		* content/browser/urlbarBindings.xml (content/urlbarBindings.xml)
		content/browser/urlbarBindings.xml (content/urlbarBindings.xml)
		* content/browser/utilityOverlay.js (content/utilityOverlay.js)
		content/browser/web-panels.js (content/web-panels.js)
		* content/browser/web-panels.xul (content/web-panels.xul)

browser/components/sessionstore/test/browser_crashedTabs.js

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ function crashBrowser(browser) {
		Cu.import("resource://gre/modules/ctypes.jsm");

		let dies = function() {
		privateNoteIntentionalCrash();
		let zero = new ctypes.intptr_t(8);
		let badptr = ctypes.cast(zero, ctypes.PointerType(ctypes.int32_t));
		badptr.contents