Attachment 8633075 Details for Bug 1100602

[patch] add show/hide events in HTMLLIAccessible::UpdateBulletlist

bulletlistfinal (text/plain), 5.51 KB, created by Lorien Hu (:lsocks)

(hide)

Description:

Filename:

MIME Type:

Creator: Lorien Hu (:lsocks)

Size: 5.51 KB

patch

obsolete

># HG changeset patch
># User Lorien Hu <lorien@lorienhu.com>
># Date 1436822690 14400
>#      Mon Jul 13 17:24:50 2015 -0400
># Node ID 5144423d5b0f78eccac22ed02888c0739f9486c8
># Parent  38d03bf4616e7fb1eaddf20cae83c9b8c0f4e7ab
>Bug 1100602 - Fire show/hide events in HTMLLIAccessible::UpdateBullet
>
>diff --git a/accessible/html/HTMLListAccessible.cpp b/accessible/html/HTMLListAccessible.cpp
>--- a/accessible/html/HTMLListAccessible.cpp
>+++ b/accessible/html/HTMLListAccessible.cpp
>@@ -97,29 +97,38 @@ HTMLLIAccessible::Bounds() const
> void
> HTMLLIAccessible::UpdateBullet(bool aHasBullet)
> {
>   if (aHasBullet == !!mBullet) {
>     NS_NOTREACHED("Bullet and accessible are in sync already!");
>     return;
>   }
> 
>+  nsRefPtr<AccReorderEvent> reorderEvent = new AccReorderEvent(this);
>+  AutoTreeMutation mut(this);
>+
>   DocAccessible* document = Document();
>   if (aHasBullet) {
>     mBullet = new HTMLListBulletAccessible(mContent, mDoc);
>     document->BindToDocument(mBullet, nullptr);
>     InsertChildAt(0, mBullet);
>+
>+    nsRefPtr<AccShowEvent> event = new AccShowEvent(mBullet, mBullet->GetContent());
>+    mDoc->FireDelayedEvent(event);
>+    reorderEvent->AddSubMutationEvent(event);
>   } else {
>+    nsRefPtr<AccHideEvent> event = new AccHideEvent(mBullet, mBullet->GetContent());
>+    mDoc->FireDelayedEvent(event);
>+    reorderEvent->AddSubMutationEvent(event);
>+
>     RemoveChild(mBullet);
>-    document->UnbindFromDocument(mBullet);
>     mBullet = nullptr;
>   }
> 
>-  // XXXtodo: fire show/hide and reorder events. That's hard to make it
>-  // right now because coalescence happens by DOM node.
>+  mDoc->FireDelayedEvent(reorderEvent);
> }
> 
> ////////////////////////////////////////////////////////////////////////////////
> // HTMLLIAccessible: Accessible protected
> 
> void
> HTMLLIAccessible::CacheChildren()
> {
>diff --git a/accessible/tests/mochitest/treeupdate/a11y.ini b/accessible/tests/mochitest/treeupdate/a11y.ini
>--- a/accessible/tests/mochitest/treeupdate/a11y.ini
>+++ b/accessible/tests/mochitest/treeupdate/a11y.ini
>@@ -1,16 +1,17 @@
> [DEFAULT]
> 
> [test_ariadialog.html]
> [test_bug852150.xhtml]
> [test_bug883708.xhtml]
> [test_bug884251.xhtml]
> [test_bug895082.html]
> [test_bug1040735.html]
>+[test_bug1100602.html]
> [test_canvas.html]
> [test_colorpicker.xul]
> [test_contextmenu.xul]
> [test_cssoverflow.html]
> [test_deck.xul]
> [test_doc.html]
> [test_gencontent.html]
> [test_hidden.html]
>diff --git a/accessible/tests/mochitest/treeupdate/test_bug1100602.html b/accessible/tests/mochitest/treeupdate/test_bug1100602.html
>new file mode 100644
>--- /dev/null
>+++ b/accessible/tests/mochitest/treeupdate/test_bug1100602.html
>@@ -0,0 +1,109 @@
>+<html>
>+
>+<head>
>+  <title>Test hide and show events for HTMLListBulletAccessibles on list restyle</title>
>+  <link rel="stylesheet" type="text/css"
>+        href="chrome://mochikit/content/tests/SimpleTest/test.css" />
>+
>+  <script type="application/javascript"
>+          src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
>+
>+  <script type="application/javascript"
>+          src="../common.js"></script>
>+  <script type="application/javascript"
>+          src="../name.js"></script>
>+  <script type="application/javascript"
>+          src="../events.js"></script>
>+
>+  <script type="application/javascript">
>+    /**
>+     * Change list style type to none.
>+     */
>+    function hideBullet()
>+    {
>+      this.eventSeq = [];
>+      this.liAcc = getAccessible(getNode("list_element"));
>+      this.bullet = this.liAcc.firstChild;
>+
>+      this.eventSeq.push(new invokerChecker(EVENT_HIDE, this.bullet));
>+      this.eventSeq.push(new invokerChecker(EVENT_REORDER, this.liAcc));
>+
>+      this.invoke = function hideBullet_invoke()
>+      {
>+        getNode("list").setAttribute("style", "list-style-type: none;");
>+      }
>+
>+      this.finalCheck = function hideBullet_finalCheck()
>+      {
>+        is(this.liAcc.name, "list element", "First child of LI should not be a bullet.");
>+      }
>+
>+      this.getID = function hideBullet_getID()
>+      {
>+        return "Hide bullet by setting style to none";
>+      }
>+    }
>+
>+    /**
>+     * Change list style type to circles.
>+     */
>+    function showBullet()
>+    {
>+      this.eventSeq = [];
>+      this.liAcc = getAccessible(getNode("list_element"));
>+
>+      this.eventSeq.push(new invokerChecker(EVENT_REORDER, this.liAcc));
>+
>+      this.invoke = function showBullet_invoke()
>+      {
>+        getNode("list").setAttribute("style", "list-style-type: circle;");
>+      }
>+
>+      this.finalCheck = function showBullet_finalCheck()
>+      {
>+        is(this.liAcc.name, "â¦ list element", "First child of LI should be a bullet.");
>+      }
>+
>+      this.getID = function showBullet_getID()
>+      {
>+        return "Show bullet by setting style to circle";
>+      }
>+    }
>+
>+    var gQueue = null;
>+    function doTest()
>+    {
>+
>+      var list = getNode("list");
>+      list.setAttribute("style", "list-style-type: circle;");
>+
>+      gQueue = new eventQueue();
>+      gQueue.push(new hideBullet());
>+      gQueue.push(new showBullet());
>+      gQueue.invoke(); // SimpleTest.finish();
>+    }
>+
>+    SimpleTest.waitForExplicitFinish();
>+    addA11yLoadEvent(doTest);
>+  </script>
>+
>+</head>
>+
>+<body>
>+
>+  <a target="_blank"
>+     href="https://bugzilla.mozilla.org/show_bug.cgi?id=1100602"
>+     title="[e10s] crash in mozilla::a11y::ProxyAccessible::Shutdown()">
>+    Mozilla Bug 1100602
>+  </a>
>+  <p id="display"></p>
>+  <div id="content" style="display: none"></div>
>+  <pre id="test">
>+  </pre>
>+
>+  <ol id="list">
>+    <li id="list_element">list element</li>
>+  </ol>
>+
>+</body>
>+</html>

Actions: View | Diff | Review

Attachments on bug 1100602: 8623368 | 8632256 | 8633075 | 8633076 | 8633511 | 8633526