Commit 4bf64bd6 authored by Ed Morley's avatar Ed Morley
Browse files

Merge last PGO-green changeset of mozilla-inbound to mozilla-central

parents 6f8dfd30 481e7dfb

accessible/src/base/nsAccessibilityService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ nsAccessibilityService::GetOrCreateAccessible(nsINode* aNode, 
  // Create accessible for visible text frames.

  if (content->IsNodeOfType(nsINode::eTEXT)) {

    nsAutoString text;

    weakFrame->GetRenderedText(&text, nullptr, nullptr, 0, PR_UINT32_MAX);

    weakFrame->GetRenderedText(&text, nullptr, nullptr, 0, UINT32_MAX);

    if (text.IsEmpty()) {

      if (aIsSubtreeHidden)

        *aIsSubtreeHidden = true;

accessible/src/generic/Accessible.h

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ public: 
   *                        then text form start offset till the end is appended

   */

  virtual void AppendTextTo(nsAString& aText, uint32_t aStartOffset = 0,

                            uint32_t aLength = PR_UINT32_MAX);

                            uint32_t aLength = UINT32_MAX);



  /**

   * Assert if child not in parent's cache if the cache was initialized at this

accessible/src/generic/TextLeafAccessible.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ public: 
  // Accessible

  virtual mozilla::a11y::role NativeRole();

  virtual void AppendTextTo(nsAString& aText, uint32_t aStartOffset = 0,

                            uint32_t aLength = PR_UINT32_MAX);

                            uint32_t aLength = UINT32_MAX);

  virtual ENameValueFlag Name(nsString& aName);



  // TextLeafAccessible

accessible/src/html/HTMLListAccessible.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public: 
  virtual a11y::role NativeRole();

  virtual uint64_t NativeState();

  virtual void AppendTextTo(nsAString& aText, uint32_t aStartOffset = 0,

                            uint32_t aLength = PR_UINT32_MAX);

                            uint32_t aLength = UINT32_MAX);



  // HTMLListBulletAccessible

accessible/tests/mochitest/events/test_focus_contextmenu.xul

+10 −1
Original line number Diff line number Diff line
@@ -24,11 +24,20 @@ 
    //gA11yEventDumpID = "eventdump"; // debug stuff

    gA11yEventDumpToConsole = true; // debug stuff

    

    var winLowerThanVista = navigator.platform.indexOf("Win") == 0;

    if (winLowerThanVista) {

      var version = Components.classes["@mozilla.org/system-info;1"]

                              .getService(Components.interfaces.nsIPropertyBag2)

                              .getProperty("version");

      version = parseFloat(version);

      winLowerThanVista = !(version >= 6.0);

    }



    var gQueue = null;

    function doTests()

    {

      // bug 746183 - Whole file times out on OS X

      if (MAC) {

      if (MAC || winLowerThanVista) {

        todo(false, "Reenable on mac after fixing bug 746183!");

        SimpleTest.finish();

        return;