mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
2eb290e0d3
- Bug 1197954 - Extract GLXFBConfig selection code for X11 windows. r=lsalzman (2816a11bdd)
- Bug 1261439 - replace nsAccUtils::IsEmbeddedObject on a bit flag check, r=marcoz (16319b9295)
- bug 1262563 - add IsFromUserInput to show / hide event messages r=davidb (dc96903cfa)
- bug 1262563 - fire show / hide events for proxied accessibles r=davidb (9b1deb77c9)
- bug 1255009 - make AccShowEvent store the insertion index of the new child r=davidb (5b3d984446)
- bug 1261144 - remove filters::GetEmbeddedObj() because it is unused r=lsocks (837bb1777c)
- bug 1261144 - devirtualize AppendObject() because the base class impl is never called r=lsocks (a8fe470965)
- bug 1261144 - move Count() from AccCollector to EmbeddedObjCollector r=lsocks (11d9734561)
- bug 1261144 - move GetAccessibleAt to EmbeddedObjCollector r=lsocks (6ac2731ec1)
- bug 1261144 - devirtualize GetIndexAt() because the base class version is never called r=lsocks (54cc48712e)
- bug 1261144 - move EnsureNGetObject to EmbeddedObjCollector r=lsocks (225b123fb0)
- bug 1261144 - move EnsureNGetIndex() to EmbeddedObjCollector r=lsocks (81986c9a95)
- bug 1261144 - move the data members of AccCollector to EmbeddedObjCollector r=lsocks (5ba20f1c30)
- bug 1261144 - remove the AccCollector class r=lsocks (6f52909c58)
- bug 1261144 - use filters::GetEmbeddedObject() directly in EmbeddedObjCollector r=lsocks (cb86410837)
- bug 1261144 - devirtualize the dtor of EmbeddedObjCollector r=lsocks (b3d23cf341)
- Bug 1261144 - stop including Filters.h in EmbeddedObjCollector.h r=lsocks (2940a4dc3d)
- bug 1261144 - call Accessible::IsText() directly from EmbeddedObjCollector r=lsocks (b93a86aa2a)
- bug 1262233 - stop using a sync message to implement ProxyAccessible::EmbeddedChildCount() r=lsocks (e2d3b6d608)
- bug 1262233 - stop implementing ProxyAccessible::IndexOfEmbeddedChild() with a sync message r=lsocks (dcedecd9d4)
- bug 1262233 - add ProxyAccessible::IsEmbeddedObject() r=lsocks (084915a784)
- bug 1262233 - stop implementing ProxyAccessible::EmbeddedChildAt() with a sync message r=lsocks (2924d04c4a)
- bug 1241453 - fire nsIAccessibleStateChangeEvents for proxied accessibles r=davidb (e423829903)
- bug 1241453 - fire nsIAccessibleEvents for proxied accessibles r=davidb (6a02c2f8a3)
- bug 1241453 - fire nsIAccessibleCaretMoveEvents for proxies r=davidb (4fb1f5be4f)
- bug 1241453 - fire nsIAccessibleTextChangeEvents for proxies r=davidb (c53a5b5122)
- Bug 1264526 - process ARIA owns relocations for in-the-document accessibles only, r=yzen (e19887eee4)
- Bug 1261174 - more events logging, r=yzen (14b83c693d)
- Bug 1257350 - Use intptr_t to avoid C4312 on VS2015; r=tbsaunde (1fc3ee9b6d)
- bug 1250882 - make xpcAccessible::GetAttributes() work with proxied accessibles r=davidb (fa676531c2)
- bug 1210741 - make AccessibleWrap::get_accLocation work with proxied accessibles r=davidb (6600987ec8)
- bug 1219528 - make NAVDIR_{FIRST,LAST}CHILD and NAVDIR_{NEXT,PREVIOUS} cases of AccessibleWrap::accNavigate deal with proxies r=davidb (c011ebcd2b)
- bug 1219528 - make AccessibleWrap::accNavigate cases using relations work with proxies r=davidb (de20c76bcc)
- bug 1215657 - make AccessibleWrap::accHitTest() work with proxies r=davidb (25da22a733)
- bug 1215657 - make AccessibleWrap::accDoDefaultAction work with proxies r=davidb (029d34d135)
- bug 1208779 - null check aAccessible in GetChildIDFor() for 32 bit as well as 64 bit windows r=davidb (08319d45e7)
- bug 1207862 - refactor GetXPAccessibleFor() so proxies and non proxies are handle in the same place for each type of id r=davidb (3ff1646e02)
- bug 1207862 - make AccessibleWrap::GetXPAccessibleFor() return the AccessibleWrap for proxies r=davidb (1184a0efeb)
- bug 1218564 - remove check for password roles in AccessibleWrap::get_accValue r=surkov (477e0bb92b)
- bug 1219528 - don't bail out of AccessibleWrap::accNavigate if the accessible wraps a proxy r=davidb (9540866b5b)
- Bug 1257303 - Cast to intptr_t to avoid C4312 on VS2015; r=tbsaunde (93af27e0db)
- Bug 1210549 - Fix AccessibleWrap::GetXPAccessibleFor for proxied accessibles r=tbsaunde (b4ed017706)
189 lines
4.8 KiB
C++
189 lines
4.8 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=2 et sw=2 tw=80: */
|
|
/* 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/. */
|
|
|
|
#include "HTMLListAccessible.h"
|
|
|
|
#include "DocAccessible.h"
|
|
#include "nsAccUtils.h"
|
|
#include "Role.h"
|
|
#include "States.h"
|
|
|
|
#include "nsBlockFrame.h"
|
|
#include "nsBulletFrame.h"
|
|
|
|
using namespace mozilla;
|
|
using namespace mozilla::a11y;
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// HTMLListAccessible
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED0(HTMLListAccessible, HyperTextAccessible)
|
|
|
|
role
|
|
HTMLListAccessible::NativeRole()
|
|
{
|
|
a11y::role r = GetAccService()->MarkupRole(mContent);
|
|
return r != roles::NOTHING ? r : roles::LIST;
|
|
}
|
|
|
|
uint64_t
|
|
HTMLListAccessible::NativeState()
|
|
{
|
|
return HyperTextAccessibleWrap::NativeState() | states::READONLY;
|
|
}
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// HTMLLIAccessible
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
HTMLLIAccessible::
|
|
HTMLLIAccessible(nsIContent* aContent, DocAccessible* aDoc) :
|
|
HyperTextAccessibleWrap(aContent, aDoc), mBullet(nullptr)
|
|
{
|
|
mType = eHTMLLiType;
|
|
|
|
nsBlockFrame* blockFrame = do_QueryFrame(GetFrame());
|
|
if (blockFrame && blockFrame->HasBullet()) {
|
|
mBullet = new HTMLListBulletAccessible(mContent, mDoc);
|
|
Document()->BindToDocument(mBullet, nullptr);
|
|
AppendChild(mBullet);
|
|
}
|
|
}
|
|
|
|
NS_IMPL_ISUPPORTS_INHERITED0(HTMLLIAccessible, HyperTextAccessible)
|
|
|
|
void
|
|
HTMLLIAccessible::Shutdown()
|
|
{
|
|
mBullet = nullptr;
|
|
|
|
HyperTextAccessibleWrap::Shutdown();
|
|
}
|
|
|
|
role
|
|
HTMLLIAccessible::NativeRole()
|
|
{
|
|
a11y::role r = GetAccService()->MarkupRole(mContent);
|
|
return r != roles::NOTHING ? r : roles::LISTITEM;
|
|
}
|
|
|
|
uint64_t
|
|
HTMLLIAccessible::NativeState()
|
|
{
|
|
return HyperTextAccessibleWrap::NativeState() | states::READONLY;
|
|
}
|
|
|
|
nsIntRect
|
|
HTMLLIAccessible::Bounds() const
|
|
{
|
|
nsIntRect rect = AccessibleWrap::Bounds();
|
|
if (rect.IsEmpty() || !mBullet || mBullet->IsInside())
|
|
return rect;
|
|
|
|
nsIntRect bulletRect = mBullet->Bounds();
|
|
|
|
rect.width += rect.x - bulletRect.x;
|
|
rect.x = bulletRect.x; // Move x coordinate of list item over to cover bullet as well
|
|
return rect;
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// HTMLLIAccessible: public
|
|
|
|
void
|
|
HTMLLIAccessible::UpdateBullet(bool aHasBullet)
|
|
{
|
|
if (aHasBullet == !!mBullet) {
|
|
NS_NOTREACHED("Bullet and accessible are in sync already!");
|
|
return;
|
|
}
|
|
|
|
TreeMutation mt(this);
|
|
if (aHasBullet) {
|
|
mBullet = new HTMLListBulletAccessible(mContent, mDoc);
|
|
mDoc->BindToDocument(mBullet, nullptr);
|
|
InsertChildAt(0, mBullet);
|
|
mt.AfterInsertion(mBullet);
|
|
}
|
|
else {
|
|
mt.BeforeRemoval(mBullet);
|
|
RemoveChild(mBullet);
|
|
mBullet = nullptr;
|
|
}
|
|
mt.Done();
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// HTMLListBulletAccessible
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
HTMLListBulletAccessible::
|
|
HTMLListBulletAccessible(nsIContent* aContent, DocAccessible* aDoc) :
|
|
LeafAccessible(aContent, aDoc)
|
|
{
|
|
mGenericTypes |= eText;
|
|
mStateFlags |= eSharedNode;
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// HTMLListBulletAccessible: Accessible
|
|
|
|
nsIFrame*
|
|
HTMLListBulletAccessible::GetFrame() const
|
|
{
|
|
nsBlockFrame* blockFrame = do_QueryFrame(mContent->GetPrimaryFrame());
|
|
return blockFrame ? blockFrame->GetBullet() : nullptr;
|
|
}
|
|
|
|
ENameValueFlag
|
|
HTMLListBulletAccessible::Name(nsString &aName)
|
|
{
|
|
aName.Truncate();
|
|
|
|
// Native anonymous content, ARIA can't be used. Get list bullet text.
|
|
nsBlockFrame* blockFrame = do_QueryFrame(mContent->GetPrimaryFrame());
|
|
if (blockFrame) {
|
|
blockFrame->GetSpokenBulletText(aName);
|
|
}
|
|
|
|
return eNameOK;
|
|
}
|
|
|
|
role
|
|
HTMLListBulletAccessible::NativeRole()
|
|
{
|
|
return roles::STATICTEXT;
|
|
}
|
|
|
|
uint64_t
|
|
HTMLListBulletAccessible::NativeState()
|
|
{
|
|
return LeafAccessible::NativeState() | states::READONLY;
|
|
}
|
|
|
|
void
|
|
HTMLListBulletAccessible::AppendTextTo(nsAString& aText, uint32_t aStartOffset,
|
|
uint32_t aLength)
|
|
{
|
|
nsAutoString bulletText;
|
|
nsBlockFrame* blockFrame = do_QueryFrame(mContent->GetPrimaryFrame());
|
|
if (blockFrame)
|
|
blockFrame->GetSpokenBulletText(bulletText);
|
|
|
|
aText.Append(Substring(bulletText, aStartOffset, aLength));
|
|
}
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// HTMLListBulletAccessible: public
|
|
|
|
bool
|
|
HTMLListBulletAccessible::IsInside() const
|
|
{
|
|
nsBlockFrame* blockFrame = do_QueryFrame(mContent->GetPrimaryFrame());
|
|
return blockFrame ? blockFrame->HasInsideBullet() : false;
|
|
}
|