para 1
para 2
+ +
`,
+ runTests
+);
diff --git a/accessible/tests/browser/bounds/browser_test_zoom_text.js b/accessible/tests/browser/bounds/browser_test_zoom_text.js
new file mode 100644
index 000000000000..758aaffb2d2a
--- /dev/null
+++ b/accessible/tests/browser/bounds/browser_test_zoom_text.js
@@ -0,0 +1,41 @@
+/* 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/. */
+
+"use strict";
+
+/* import-globals-from ../../mochitest/layout.js */
+
+async function runTests(browser, accDoc) {
+ function testTextNode(id) {
+ let hyperTextNode = findAccessibleChildByID(accDoc, id);
+ let textNode = hyperTextNode.firstChild;
+
+ let [x, y, width, height] = getBounds(textNode);
+ testTextBounds(hyperTextNode, 0, -1, [x, y, width, height],
+ COORDTYPE_SCREEN_RELATIVE);
+ }
+
+ loadFrameScripts(browser, { name: 'layout.js', dir: MOCHITESTS_DIR });
+
+ testTextNode("p1");
+ testTextNode("p2");
+
+ await ContentTask.spawn(browser, {}, () => {
+ zoomDocument(document, 2.0);
+ });
+
+ testTextNode("p1");
+
+ await ContentTask.spawn(browser, {}, () => {
+ zoomDocument(document, 1.0);
+ });
+}
+
+/**
+ * Test the text range boundary when page is zoomed
+ */
+addAccessibleTask(`
+ Tilimilitryamdiya
+ل
`, runTests +); diff --git a/accessible/tests/browser/bounds/head.js b/accessible/tests/browser/bounds/head.js new file mode 100644 index 000000000000..6718fc5c7415 --- /dev/null +++ b/accessible/tests/browser/bounds/head.js @@ -0,0 +1,16 @@ +/* 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/. */ + +'use strict'; + +// Load the shared-head file first. +/* import-globals-from ../shared-head.js */ +Services.scriptloader.loadSubScript( + 'chrome://mochitests/content/browser/accessible/tests/browser/shared-head.js', + this); + +// Loading and common.js from accessible/tests/mochitest/ for all tests, as +// well as events.js. +loadScripts({ name: 'common.js', dir: MOCHITESTS_DIR }, + { name: 'layout.js', dir: MOCHITESTS_DIR }, 'events.js'); diff --git a/accessible/tests/browser/scroll/browser_test_zoom_text.js b/accessible/tests/browser/scroll/browser_test_zoom_text.js index 3fa4bd2450fa..a3122f6ad70d 100644 --- a/accessible/tests/browser/scroll/browser_test_zoom_text.js +++ b/accessible/tests/browser/scroll/browser_test_zoom_text.js @@ -8,6 +8,8 @@ loadScripts({ name: 'layout.js', dir: MOCHITESTS_DIR }); async function runTests(browser, accDoc) { + loadFrameScripts(browser, { name: 'layout.js', dir: MOCHITESTS_DIR }); + let paragraph = findAccessibleChildByID(accDoc, "paragraph", [nsIAccessibleText]); let offset = 64; // beginning of 4th stanza @@ -18,7 +20,9 @@ async function runTests(browser, accDoc) { COORDTYPE_SCREEN_RELATIVE, docX, docY); testTextPos(paragraph, offset, [x, docY], COORDTYPE_SCREEN_RELATIVE); - await zoomContent(browser, 2.0); + await ContentTask.spawn(browser, {}, () => { + zoomDocument(document, 2.0); + }); paragraph = findAccessibleChildByID(accDoc, "paragraph2", [nsIAccessibleText]); offset = 52; // // beginning of 4th stanza diff --git a/accessible/tests/browser/scroll/head.js b/accessible/tests/browser/scroll/head.js index 4af98a2a27d0..1454e55c7e9e 100644 --- a/accessible/tests/browser/scroll/head.js +++ b/accessible/tests/browser/scroll/head.js @@ -4,27 +4,12 @@ 'use strict'; -/* exported zoomContent */ - // Load the shared-head file first. /* import-globals-from ../shared-head.js */ Services.scriptloader.loadSubScript( 'chrome://mochitests/content/browser/accessible/tests/browser/shared-head.js', this); -async function zoomContent(browser, zoom) -{ - return ContentTask.spawn(browser, zoom, _zoom => { - let docShell = content - .QueryInterface(Components.interfaces.nsIInterfaceRequestor) - .getInterface(Components.interfaces.nsIWebNavigation) - .QueryInterface(Components.interfaces.nsIDocShell); - let docViewer = docShell.contentViewer; - - docViewer.fullZoom = _zoom; - }); -} - // Loading and common.js from accessible/tests/mochitest/ for all tests, as // well as events.js. loadScripts({ name: 'common.js', dir: MOCHITESTS_DIR }, 'events.js'); diff --git a/accessible/tests/browser/shared-head.js b/accessible/tests/browser/shared-head.js index 1158f9812baf..16c8daecd8de 100644 --- a/accessible/tests/browser/shared-head.js +++ b/accessible/tests/browser/shared-head.js @@ -8,7 +8,7 @@ /* import-globals-from events.js */ /* exported Logger, MOCHITESTS_DIR, invokeSetAttribute, invokeFocus, - invokeSetStyle, getAccessibleDOMNodeID, + invokeSetStyle, getAccessibleDOMNodeID, getAccessibleTagName, addAccessibleTask, findAccessibleChildByID, isDefunct, CURRENT_CONTENT_DIR, loadScripts, loadFrameScripts, Cc, Cu */ @@ -31,6 +31,8 @@ const MOCHITESTS_DIR = const CURRENT_CONTENT_DIR = 'http://example.com/browser/accessible/tests/browser/'; +const LOADED_FRAMESCRIPTS = new Map(); + /** * Used to dump debug information. */ @@ -188,7 +190,17 @@ function loadFrameScripts(browser, ...scripts) { // Script is a object that has { dir, name } format. frameScript = `${script.dir}${script.name}`; } + + let loadedScriptSet = LOADED_FRAMESCRIPTS.get(frameScript); + if (!loadedScriptSet) { + loadedScriptSet = new WeakSet(); + LOADED_FRAMESCRIPTS.set(frameScript, loadedScriptSet); + } else if (loadedScriptSet.has(browser)) { + continue; + } + mm.loadFrameScript(frameScript, false, true); + loadedScriptSet.add(browser); } } @@ -280,6 +292,19 @@ function isDefunct(accessible) { return defunct; } +/** + * Get the DOM tag name for a given accessible. + * @param {nsIAccessible} accessible accessible + * @return {String?} tag name of associated DOM node, or null. + */ +function getAccessibleTagName(acc) { + try { + return acc.attributes.getStringProperty("tag"); + } catch (e) { + return null; + } +} + /** * Traverses the accessible tree starting from a given accessible as a root and * looks for an accessible that matches based on its DOMNode id. diff --git a/accessible/tests/mochitest/bounds/a11y.ini b/accessible/tests/mochitest/bounds/a11y.ini index d60bd46a50fe..bdb8c02f90a2 100644 --- a/accessible/tests/mochitest/bounds/a11y.ini +++ b/accessible/tests/mochitest/bounds/a11y.ini @@ -4,5 +4,3 @@ support-files = [test_list.html] [test_select.html] -[test_zoom.html] -[test_zoom_text.html] diff --git a/accessible/tests/mochitest/bounds/test_zoom.html b/accessible/tests/mochitest/bounds/test_zoom.html deleted file mode 100644 index fc2dee4828e2..000000000000 --- a/accessible/tests/mochitest/bounds/test_zoom.html +++ /dev/null @@ -1,96 +0,0 @@ - - - --- - diff --git a/accessible/tests/mochitest/bounds/test_zoom_text.html b/accessible/tests/mochitest/bounds/test_zoom_text.html deleted file mode 100644 index 1637f344e31c..000000000000 --- a/accessible/tests/mochitest/bounds/test_zoom_text.html +++ /dev/null @@ -1,77 +0,0 @@ - - - -
-- -