Commit fcba2de1 authored by Gurzau Raul's avatar Gurzau Raul
Browse files

Merge mozilla-central to autoland. a=merge CLOSED TREE

parents 7acca4d9 e39c283d

.hgtags

+1 −0
Original line number Diff line number Diff line
@@ -142,3 +142,4 @@ f7e9777221a34f9f23c2e4933307eb38b621b679 FIREFOX_NIGHTLY_57_END 
e33efdb3e1517d521deb949de3fcd6d9946ea440 FIREFOX_BETA_60_BASE

fdd1a0082c71673239fc2f3a6a93de889c07a1be FIREFOX_NIGHTLY_60_END

ccfd7b716a91241ddbc084cb7116ec561e56d5d1 FIREFOX_BETA_61_BASE

93443d36d4bd53dba004f7b73430879f96daa681 FIREFOX_NIGHTLY_61_END

CLOBBER

+1 −1
Original line number Diff line number Diff line
@@ -22,4 +22,4 @@ 
# changes to stick? As of bug 928195, this shouldn't be necessary! Please

# don't change CLOBBER for WebIDL changes any more.



Bug 1451159 - Moved testing/profiles/prefs_general.js (prevents symlinked file does not exist)
 
Merge day clobber
 
 No newline at end of file

accessible/base/DocManager.cpp

+11 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include "mozilla/EventListenerManager.h"

#include "mozilla/dom/Event.h" // for Event

#include "nsContentUtils.h"

#include "nsCURILoader.h"

#include "nsDocShellLoadTypes.h"

#include "nsIChannel.h"
@@ -477,6 +478,16 @@ DocManager::CreateDocOrRootAccessible(nsIDocument* aDocument) 
    return nullptr;

  }



  nsIDocShell* docShell = aDocument->GetDocShell();

  if (!docShell || docShell->IsInvisible()) {

    return nullptr;

  }



  nsIWidget* widget = nsContentUtils::WidgetForDocument(aDocument);

  if (!widget || widget->WindowType() == eWindowType_invisible) {

    return nullptr;

  }



  // Ignore documents without presshell and not having root frame.

  nsIPresShell* presShell = aDocument->GetShell();

  if (!presShell || presShell->IsDestroying())

accessible/tests/mochitest/events/docload/a11y.ini

+2 −0
Original line number Diff line number Diff line
@@ -8,4 +8,6 @@ support-files = 
[test_docload_embedded.html]

[test_docload_iframe.html]

[test_docload_root.html]

skip-if = os == 'mac' # bug 1456997

[test_docload_shutdown.html]

skip-if = os == 'mac' # bug 1456997

accessible/tests/mochitest/events/docload/test_docload_root.html

+14 −28
Original line number Diff line number Diff line
@@ -13,25 +13,6 @@ 
          src="../../common.js"></script>

  <script type="application/javascript"

          src="../../role.js"></script>



  <script type="application/javascript">

    // Front end stuff sometimes likes to stuff things in the hidden window(s)

    // in which case there's accessibles for that content.

    ChromeUtils.import("resource://gre/modules/Services.jsm");



    // Force the creation of an accessible for the hidden window's document.

    let doc = Services.appShell.hiddenDOMWindow.document;

    gAccService.getAccessibleFor(doc);



    // The private hidden window will be lazily created that's why we need to do

    // it here *before* loading '../../events.js' or else we'll have a duplicate

    // reorder event.

    let privateDoc = Services.appShell.hiddenPrivateDOMWindow.document;



    // Force the creation of an accessible for the private hidden window's doc.

    gAccService.getAccessibleFor(privateDoc);

  </script>



  <script type="application/javascript"

          src="../../events.js"></script>
@@ -64,15 +45,6 @@ 
        const accTree = {

          role: ROLE_APP_ROOT,

          children: [

            {

              role: ROLE_CHROME_WINDOW

            },

            {

              role: ROLE_CHROME_WINDOW

            },

            {

              role: ROLE_CHROME_WINDOW

            },

            {

              role: ROLE_CHROME_WINDOW

            },
@@ -114,6 +86,20 @@ 
    // Do tests



    function doTests() {

      // Front end stuff sometimes likes to stuff things in the hidden window(s)

      // in which case we should repress all accessibles for those.

      ChromeUtils.import("resource://gre/modules/Services.jsm");



      // Try to create an accessible for the hidden window's document.

      let doc = Services.appShell.hiddenDOMWindow.document;

      let hiddenDocAcc = gAccService.getAccessibleFor(doc);

      ok(!hiddenDocAcc, "hiddenDOMWindow should not have an accessible.");



      // Try to create an accessible for the private hidden window's doc.

      let privateDoc = Services.appShell.hiddenPrivateDOMWindow.document;

      let hiddenPrivateDoc = gAccService.getAccessibleFor(privateDoc);

      ok(!hiddenPrivateDoc, "hiddenPrivateDOMWindow should not have an accessible.");



      const gQueue = new eventQueue();

      gQueue.push(new openDialogWnd("about:about"));

      gQueue.push(new closeDialogWnd());