Bug 733848 - more experiments on accessible/name/test_markup.html
authorAlexander Surkov <surkov.alexander@gmail.com>
Mon, 29 Oct 2012 18:19:11 +0900
changeset 111793 9e04e7f6a1302dd056cb7368a960a6dc8f5ec7ec
parent 111792 a886c22fe9d135754dc3059d1f21a4e0009fbd81
child 111794 93bfd0a08a3592403ce12b7157d4e87bf34fb185
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
bugs733848
milestone19.0a1
Bug 733848 - more experiments on accessible/name/test_markup.html
accessible/tests/mochitest/name/markup.js
accessible/tests/mochitest/name/markuprules.xml
--- a/accessible/tests/mochitest/name/markup.js
+++ b/accessible/tests/mochitest/name/markup.js
@@ -109,22 +109,16 @@ function testNamesForMarkup(aMarkupElm)
 
   var child = aMarkupElm.firstChild;
   while (child) {
     var newChild = document.importNode(child, true);
     div.appendChild(newChild);
     child = child.nextSibling;
   }
 
-  // Wave over images to create frames.
-  var imgElms = div.getElementsByTagName("html:img");
-  for (var idx = 0; idx < imgElms.length; idx++) {
-    waveOverImageMap(imgElms[idx]);
-  }
-
   if (gDumpToConsole) {
     dump("\nProcessing markup. Wait for reorder event on " +
          prettyName(document) + "'\n");
   }
   waitForEvent(EVENT_REORDER, document, testNamesForMarkupRules,
                 null, aMarkupElm, div);
 
   document.body.appendChild(div);
--- a/accessible/tests/mochitest/name/markuprules.xml
+++ b/accessible/tests/mochitest/name/markuprules.xml
@@ -197,28 +197,30 @@
                      aria-labelledby="l1 l2"
                      label="test4"
                      title="test5"
                      a11yname="option1">option1</html:option>
         <html:option>option2</html:option>
       </html:select>
     </markup>
 
-    <markup ref="html:img" ruleset="htmlimage">
+    <markup ref="html:img" ruleset="htmlimage"
+            id="markupHTMLImageTest">
       <html:span id="l1" a11yname="test2">test2</html:span>
       <html:span id="l2" a11yname="test3">test3</html:span>
       <html:img id="img"
                 aria-label="Logo of Mozilla"
                 aria-labelledby="l1 l2"
                 alt="Mozilla logo"
                 title="This is a logo"
                 src="../moz.png"/>
     </markup>
 
     <markup ref="html:img" ruleset="htmlimageemptyalt">
+            id="markupHTMLImageEmptyAltTest"
       <html:span id="l1" a11yname="test2">test2</html:span>
       <html:span id="l2" a11yname="test3">test3</html:span>
       <html:img id="imgemptyalt"
                  aria-label="Logo of Mozilla"
                  aria-labelledby="l1 l2"
                  title="This is a logo"
                  alt=""
                  src="../moz.png"/>