Merge m-i to m-c (bf91c751) · Commits · The Tor Project / Applications / Mullvad Browser

Makefile.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -332,7 +332,7 @@ toolkit/library/target: ../ldap/target
		endif
		ifndef MOZ_FOLD_LIBS
		ifndef MOZ_NATIVE_SQLITE
		security/build/target: db/sqlite3/src/target
		config/external/nss/target: db/sqlite3/src/target
		endif
		endif
		ifeq ($(MOZ_REPLACE_MALLOC_LINKAGE),dummy library)

accessible/jsat/AccessFu.jsm

+135 −224

Original line number	Diff line number	Diff line
		@@ -2,26 +2,26 @@
		* 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/. */

		/* global AccessFu, Components, Utils, PrefCache, Logger, Services,
		PointerAdapter, dump, Presentation, Rect */
		/* exported AccessFu */

		'use strict';

		const Cc = Components.classes;
		const Ci = Components.interfaces;
		const Cu = Components.utils;
		const Cr = Components.results;
		const {utils: Cu, interfaces: Ci} = Components;

		this.EXPORTED_SYMBOLS = ['AccessFu'];
		this.EXPORTED_SYMBOLS = ['AccessFu']; // jshint ignore:line

		Cu.import('resource://gre/modules/Services.jsm');

		Cu.import('resource://gre/modules/accessibility/Utils.jsm');

		const ACCESSFU_DISABLE = 0;
		const ACCESSFU_DISABLE = 0; // jshint ignore:line
		const ACCESSFU_ENABLE = 1;
		const ACCESSFU_AUTO = 2;

		const SCREENREADER_SETTING = 'accessibility.screenreader';

		this.AccessFu = {
		this.AccessFu = { // jshint ignore:line
		/**
		* Initialize chrome-layer accessibility functionality.
		* If accessibility is enabled on the platform, then a special accessibility
		@@ -77,8 +77,9 @@ this.AccessFu = {
		* with arrow keys.
		*/
		_enable: function _enable() {
		if (this._enabled)
		if (this._enabled) {
		return;
		}
		this._enabled = true;

		Cu.import('resource://gre/modules/accessibility/Utils.jsm');
		@@ -87,7 +88,7 @@ this.AccessFu = {

		Logger.info('Enabled');

		for each (let mm in Utils.AllMessageManagers) {
		for (let mm of Utils.AllMessageManagers) {
		this._addMessageListeners(mm);
		this._loadFrameScript(mm);
		}
		@@ -135,8 +136,7 @@ this.AccessFu = {
		}

		if (Utils.MozBuildApp !== 'mobile/android') {
		this.announce(
		Utils.stringBundle.GetStringFromName('screenReaderStarted'));
		this.announce('screenReaderStarted');
		}
		},

		@@ -144,8 +144,9 @@ this.AccessFu = {
		* Disable AccessFu and return to default interaction mode.
		*/
		_disable: function _disable() {
		if (!this._enabled)
		if (!this._enabled) {
		return;
		}

		this._enabled = false;

		@@ -154,11 +155,10 @@ this.AccessFu = {
		Utils.win.document.removeChild(this.stylesheet.get());

		if (Utils.MozBuildApp !== 'mobile/android') {
		this.announce(
		Utils.stringBundle.GetStringFromName('screenReaderStopped'));
		this.announce('screenReaderStopped');
		}

		for each (let mm in Utils.AllMessageManagers) {
		for (let mm of Utils.AllMessageManagers) {
		mm.sendAsyncMessage('AccessFu:Stop');
		this._removeMessageListeners(mm);
		}
		@@ -196,10 +196,11 @@ this.AccessFu = {
		}
		let activatePref = this._activatePref.value;
		if (activatePref == ACCESSFU_ENABLE \|\|
		this._systemPref && activatePref == ACCESSFU_AUTO)
		this._systemPref && activatePref == ACCESSFU_AUTO) {
		this._enable();
		else
		} else {
		this._disable();
		}
		} catch (x) {
		dump('Error ' + x.message + ' ' + x.fileName + ':' + x.lineNumber);
		}
		@@ -234,9 +235,10 @@ this.AccessFu = {
		},

		_output: function _output(aPresentationData, aBrowser) {
		for each (let presenter in aPresentationData) {
		if (!presenter)
		for (let presenter of aPresentationData) {
		if (!presenter) {
		continue;
		}

		try {
		Output[presenter.type](presenter.details, aBrowser);
		@@ -392,8 +394,8 @@ this.AccessFu = {
		_processedMessageManagers: [],

		/**
		* Adjusts the given bounds relative to the given browser. Converts from screen
		* or device pixels to either device or CSS pixels.
		* Adjusts the given bounds relative to the given browser. Converts from
		* screen or device pixels to either device or CSS pixels.
		* @param {Rect} aJsonBounds the bounds to adjust
		* @param {browser} aBrowser the browser we want the bounds relative to
		* @param {bool} aToCSSPixels whether to convert to CSS pixels (as opposed to
		@@ -401,7 +403,8 @@ this.AccessFu = {
		* @param {bool} aFromDevicePixels whether to convert from device pixels (as
		* opposed to screen pixels)
		*/
		adjustContentBounds: function(aJsonBounds, aBrowser, aToCSSPixels, aFromDevicePixels) {
		adjustContentBounds:
		function(aJsonBounds, aBrowser, aToCSSPixels, aFromDevicePixels) {
		let bounds = new Rect(aJsonBounds.left, aJsonBounds.top,
		aJsonBounds.right - aJsonBounds.left,
		aJsonBounds.bottom - aJsonBounds.top);
		@@ -420,9 +423,10 @@ this.AccessFu = {
		}

		// Here we scale from screen pixels to layout device pixels by dividing by
		// the resolution (caused by pinch-zooming). The resolution is the viewport
		// zoom divided by the devicePixelRatio. If there's no viewport, then we're
		// on a platform without pinch-zooming and we can just ignore this.
		// the resolution (caused by pinch-zooming). The resolution is the
		// viewport zoom divided by the devicePixelRatio. If there's no viewport,
		// then we're on a platform without pinch-zooming and we can just ignore
		// this.
		if (!aFromDevicePixels && vp) {
		bounds = bounds.scale(vp.zoom / dpr, vp.zoom / dpr);
		}
		@@ -453,8 +457,9 @@ var Output = {
		if (aOutput && 'output' in aOutput) {
		this.startOffset = aOutput.startOffset;
		this.endOffset = aOutput.endOffset;
		// We need to append a space at the end so that the routing key corresponding
		// to the end of the output (i.e. the space) can be hit to move the caret there.
		// We need to append a space at the end so that the routing key
		// corresponding to the end of the output (i.e. the space) can be hit to
		// move the caret there.
		this.text = aOutput.output + ' ';
		this.selectionStart = typeof aOutput.selectionStart === 'number' ?
		aOutput.selectionStart : this.selectionStart;
		@@ -502,104 +507,17 @@ var Output = {
		braille.startOffset = this.startOffset;
		braille.endOffset = this.endOffset;
		braille.text = this.text;
		this.selectionStart = braille.selectionStart = aSelection.selectionStart + this.startOffset;
		this.selectionEnd = braille.selectionEnd = aSelection.selectionEnd + this.startOffset;
		this.selectionStart = braille.selectionStart =
		aSelection.selectionStart + this.startOffset;
		this.selectionEnd = braille.selectionEnd =
		aSelection.selectionEnd + this.startOffset;

		return braille;
		}
		},

		speechHelper: {
		EARCONS: ['virtual_cursor_move.ogg',
		'virtual_cursor_key.ogg',
		'clicked.ogg'],

		earconBuffers: {},

		inited: false,

		webspeechEnabled: false,

		deferredOutputs: [],

		init: function init() {
		let window = Utils.win;
		this.webspeechEnabled = !!window.speechSynthesis &&
		!!window.SpeechSynthesisUtterance;

		let settingsToGet = 2;
		let settingsCallback = (aName, aSetting) => {
		if (--settingsToGet > 0) {
		return;
		}

		this.inited = true;

		for (let actions of this.deferredOutputs) {
		this.output(actions);
		}
		};

		this._volumeSetting = new SettingCache(
		'accessibility.screenreader-volume', settingsCallback,
		{ defaultValue: 1, callbackNow: true, callbackOnce: true });
		this._rateSetting = new SettingCache(
		'accessibility.screenreader-rate', settingsCallback,
		{ defaultValue: 0, callbackNow: true, callbackOnce: true });

		for (let earcon of this.EARCONS) {
		let earconName = /(^.)\..$/.exec(earcon)[1];
		this.earconBuffers[earconName] = new WeakMap();
		this.earconBuffers[earconName].set(
		window, new window.Audio('chrome://global/content/accessibility/' + earcon));
		}
		},

		uninit: function uninit() {
		if (this.inited) {
		delete this._volumeSetting;
		delete this._rateSetting;
		}
		this.inited = false;
		},

		output: function output(aActions) {
		if (!this.inited) {
		this.deferredOutputs.push(aActions);
		return;
		}

		for (let action of aActions) {
		let window = Utils.win;
		Logger.debug('tts.' + action.method, '"' + action.data + '"',
		JSON.stringify(action.options));

		if (!action.options.enqueue && this.webspeechEnabled) {
		window.speechSynthesis.cancel();
		}

		if (action.method === 'speak' && this.webspeechEnabled) {
		let utterance = new window.SpeechSynthesisUtterance(action.data);
		let requestedRate = this._rateSetting.value;
		utterance.volume = this._volumeSetting.value;
		utterance.rate = requestedRate >= 0 ?
		requestedRate + 1 : 1 / (Math.abs(requestedRate) + 1);
		window.speechSynthesis.speak(utterance);
		} else if (action.method === 'playEarcon') {
		let audioBufferWeakMap = this.earconBuffers[action.data];
		if (audioBufferWeakMap) {
		let node = audioBufferWeakMap.get(window).cloneNode(false);
		node.volume = this._volumeSetting.value;
		node.play();
		}
		}
		}
		}
		},

		start: function start() {
		Cu.import('resource://gre/modules/Geometry.jsm');
		this.speechHelper.init();
		},

		stop: function stop() {
		@@ -607,22 +525,32 @@ var Output = {
		Utils.win.document.documentElement.removeChild(this.highlightBox.get());
		delete this.highlightBox;
		}

		if (this.announceBox) {
		Utils.win.document.documentElement.removeChild(this.announceBox.get());
		delete this.announceBox;
		}

		this.speechHelper.uninit();
		},

		Speech: function Speech(aDetails, aBrowser) {
		this.speechHelper.output(aDetails.actions);
		B2G: function B2G(aDetails) {
		let details = {
		type: 'accessfu-output',
		details: JSON.stringify(aDetails)
		};
		let window = Utils.win;
		if (window.shell) {
		// On B2G device.
		window.shell.sendChromeEvent(details);
		} else {
		// Dispatch custom event to have support for desktop and screen reader
		// emulator add-on.
		window.dispatchEvent(new window.CustomEvent(details.type, {
		bubbles: true,
		cancelable: true,
		detail: details
		}));
		}
		},

		Visual: function Visual(aDetails, aBrowser) {
		switch (aDetails.method) {
		case 'showBounds':
		Visual: function Visual(aDetail, aBrowser) {
		switch (aDetail.eventType) {
		case 'viewport-change':
		case 'vc-change':
		{
		let highlightBox = null;
		if (!this.highlightBox) {
		@@ -643,8 +571,8 @@ var Output = {
		highlightBox = this.highlightBox.get();
		}

		let padding = aDetails.padding;
		let r = AccessFu.adjustContentBounds(aDetails.bounds, aBrowser, true);
		let padding = aDetail.padding;
		let r = AccessFu.adjustContentBounds(aDetail.bounds, aBrowser, true);

		// First hide it to avoid flickering when changing the style.
		highlightBox.style.display = 'none';
		@@ -656,43 +584,12 @@ var Output = {

		break;
		}
		case 'hideBounds':
		case 'tabstate-change':
		{
		let highlightBox = this.highlightBox ? this.highlightBox.get() : null;
		if (highlightBox)
		if (highlightBox) {
		highlightBox.style.display = 'none';
		break;
		}
		case 'showAnnouncement':
		{
		let announceBox = this.announceBox ? this.announceBox.get() : null;
		if (!announceBox) {
		announceBox = Utils.win.document.
		createElementNS('http://www.w3.org/1999/xhtml', 'div');
		announceBox.id = 'announce-box';
		Utils.win.document.documentElement.appendChild(announceBox);
		this.announceBox = Cu.getWeakReference(announceBox);
		}

		announceBox.innerHTML = '<div>' + aDetails.text + '</div>';
		announceBox.classList.add('showing');

		if (this._announceHideTimeout)
		Utils.win.clearTimeout(this._announceHideTimeout);

		if (aDetails.duration > 0)
		this._announceHideTimeout = Utils.win.setTimeout(
		function () {
		announceBox.classList.remove('showing');
		this._announceHideTimeout = 0;
		}.bind(this), aDetails.duration);
		break;
		}
		case 'hideAnnouncement':
		{
		let announceBox = this.announceBox ? this.announceBox.get() : null;
		if (announceBox)
		announceBox.classList.remove('showing');
		break;
		}
		}
		@@ -716,32 +613,33 @@ var Output = {
		return;
		}

		for each (let androidEvent in aDetails) {
		for (let androidEvent of aDetails) {
		androidEvent.type = 'Accessibility:Event';
		if (androidEvent.bounds)
		androidEvent.bounds = AccessFu.adjustContentBounds(androidEvent.bounds, aBrowser);
		if (androidEvent.bounds) {
		androidEvent.bounds = AccessFu.adjustContentBounds(
		androidEvent.bounds, aBrowser);
		}

		switch(androidEvent.eventType) {
		case ANDROID_VIEW_TEXT_CHANGED:
		androidEvent.brailleOutput = this.brailleState.adjustText(androidEvent.text);
		androidEvent.brailleOutput = this.brailleState.adjustText(
		androidEvent.text);
		break;
		case ANDROID_VIEW_TEXT_SELECTION_CHANGED:
		androidEvent.brailleOutput = this.brailleState.adjustSelection(androidEvent.brailleOutput);
		androidEvent.brailleOutput = this.brailleState.adjustSelection(
		androidEvent.brailleOutput);
		break;
		default:
		androidEvent.brailleOutput = this.brailleState.init(androidEvent.brailleOutput);
		androidEvent.brailleOutput = this.brailleState.init(
		androidEvent.brailleOutput);
		break;
		}
		this.androidBridge.handleGeckoMessage(androidEvent);
		}
		},

		Haptic: function Haptic(aDetails, aBrowser) {
		Utils.win.navigator.vibrate(aDetails.pattern);
		},

		Braille: function Braille(aDetails, aBrowser) {
		Logger.debug('Braille output: ' + aDetails.text);
		Braille: function Braille(aDetails) {
		Logger.debug('Braille output: ' + aDetails.output);
		}
		};

		@@ -849,16 +747,18 @@ var Input = {
		let target = aEvent.target;

		// Ignore keys with modifiers so the content could take advantage of them.
		if (aEvent.ctrlKey \|\| aEvent.altKey \|\| aEvent.metaKey)
		if (aEvent.ctrlKey \|\| aEvent.altKey \|\| aEvent.metaKey) {
		return;
		}

		switch (aEvent.keyCode) {
		case 0:
		// an alphanumeric key was pressed, handle it separately.
		// If it was pressed with either alt or ctrl, just pass through.
		// If it was pressed with meta, pass the key on without the meta.
		if (this.editState.editing)
		if (this.editState.editing) {
		return;
		}

		let key = String.fromCharCode(aEvent.charCode);
		try {
		@@ -870,43 +770,50 @@ var Input = {
		break;
		case aEvent.DOM_VK_RIGHT:
		if (this.editState.editing) {
		if (!this.editState.atEnd)
		if (!this.editState.atEnd) {
		// Don't move forward if caret is not at end of entry.
		// XXX: Fix for rtl
		return;
		else
		} else {
		target.blur();
		}
		this.moveCursor(aEvent.shiftKey ? 'moveLast' : 'moveNext', 'Simple', 'keyboard');
		}
		this.moveCursor(aEvent.shiftKey ?
		'moveLast' : 'moveNext', 'Simple', 'keyboard');
		break;
		case aEvent.DOM_VK_LEFT:
		if (this.editState.editing) {
		if (!this.editState.atStart)
		if (!this.editState.atStart) {
		// Don't move backward if caret is not at start of entry.
		// XXX: Fix for rtl
		return;
		else
		} else {
		target.blur();
		}
		this.moveCursor(aEvent.shiftKey ? 'moveFirst' : 'movePrevious', 'Simple', 'keyboard');
		}
		this.moveCursor(aEvent.shiftKey ?
		'moveFirst' : 'movePrevious', 'Simple', 'keyboard');
		break;
		case aEvent.DOM_VK_UP:
		if (this.editState.multiline) {
		if (!this.editState.atStart)
		if (!this.editState.atStart) {
		// Don't blur content if caret is not at start of text area.
		return;
		else
		} else {
		target.blur();
		}
		}

		if (Utils.MozBuildApp == 'mobile/android')
		if (Utils.MozBuildApp == 'mobile/android') {
		// Return focus to native Android browser chrome.
		Services.androidBridge.handleGeckoMessage(
		{ type: 'ToggleChrome:Focus' });
		}
		break;
		case aEvent.DOM_VK_RETURN:
		if (this.editState.editing)
		if (this.editState.editing) {
		return;
		}
		this.activateCurrent();
		break;
		default:
		@@ -980,7 +887,8 @@ var Input = {

		activateContextMenu: function activateContextMenu(aDetails) {
		if (Utils.MozBuildApp === 'mobile/android') {
		let p = AccessFu.adjustContentBounds(aDetails.bounds, Utils.CurrentBrowser,
		let p = AccessFu.adjustContentBounds(aDetails.bounds,
		Utils.CurrentBrowser,
		true, true).center();
		Services.obs.notifyObservers(null, 'Gesture:LongPress',
		JSON.stringify({x: p.x, y: p.y}));
		@@ -999,7 +907,8 @@ var Input = {

		sendScrollMessage: function sendScrollMessage(aPage, aHorizontal) {
		let mm = Utils.getMessageManager(Utils.CurrentBrowser);
		mm.sendAsyncMessage('AccessFu:Scroll', {page: aPage, horizontal: aHorizontal, origin: 'top'});
		mm.sendAsyncMessage('AccessFu:Scroll',
		{page: aPage, horizontal: aHorizontal, origin: 'top'});
		},

		doScroll: function doScroll(aDetails) {
		@@ -1058,13 +967,15 @@ var Input = {
		},

		previous: function quickNavMode_previous() {
		if (--this._currentIndex < 0)
		if (--this._currentIndex < 0) {
		this._currentIndex = this.modes.length - 1;
		}
		},

		next: function quickNavMode_next() {
		if (++this._currentIndex >= this.modes.length)
		if (++this._currentIndex >= this.modes.length) {
		this._currentIndex = 0;
		}
		},

		updateModes: function updateModes(aModes) {