mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 21:35:39 +00:00
Backed out 2 changesets (bug 1162621, bug 1162654) for Gip(a) orange
Backed out changeset 82bbc0b0d516 (bug 1162654) Backed out changeset 01c406429093 (bug 1162621)
This commit is contained in:
parent
df468ba93d
commit
74c760f779
@ -855,13 +855,6 @@ getIndexInParentCB(AtkObject* aAtkObj)
|
|||||||
{
|
{
|
||||||
// We don't use Accessible::IndexInParent() because we don't include text
|
// We don't use Accessible::IndexInParent() because we don't include text
|
||||||
// leaf nodes as children in ATK.
|
// leaf nodes as children in ATK.
|
||||||
if (ProxyAccessible* proxy = GetProxy(aAtkObj)) {
|
|
||||||
if (ProxyAccessible* parent = proxy->Parent())
|
|
||||||
return parent->IndexOfEmbeddedChild(proxy);
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
|
AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
|
||||||
if (!accWrap) {
|
if (!accWrap) {
|
||||||
return -1;
|
return -1;
|
||||||
@ -1060,9 +1053,6 @@ GetInterfacesForProxy(ProxyAccessible* aProxy, uint32_t aInterfaces)
|
|||||||
if (aInterfaces & Interfaces::IMAGE)
|
if (aInterfaces & Interfaces::IMAGE)
|
||||||
interfaces |= MAI_INTERFACE_IMAGE;
|
interfaces |= MAI_INTERFACE_IMAGE;
|
||||||
|
|
||||||
if (aInterfaces & Interfaces::DOCUMENT)
|
|
||||||
interfaces |= MAI_INTERFACE_DOCUMENT;
|
|
||||||
|
|
||||||
return interfaces;
|
return interfaces;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,9 +39,6 @@ InterfacesFor(Accessible* aAcc)
|
|||||||
if (aAcc->IsTableCell())
|
if (aAcc->IsTableCell())
|
||||||
interfaces |= Interfaces::TABLECELL;
|
interfaces |= Interfaces::TABLECELL;
|
||||||
|
|
||||||
if (aAcc->IsDoc())
|
|
||||||
interfaces |= Interfaces::DOCUMENT;
|
|
||||||
|
|
||||||
return interfaces;
|
return interfaces;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1618,22 +1615,6 @@ DocAccessibleChild::RecvTakeFocus(const uint64_t& aID)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
DocAccessibleChild::RecvIndexOfEmbeddedChild(const uint64_t& aID,
|
|
||||||
const uint64_t& aChildID,
|
|
||||||
uint32_t* aChildIdx)
|
|
||||||
{
|
|
||||||
*aChildIdx = 0;
|
|
||||||
|
|
||||||
Accessible* parent = IdToAccessible(aID);
|
|
||||||
Accessible* child = IdToAccessible(aChildID);
|
|
||||||
if (!parent || !child)
|
|
||||||
return true;
|
|
||||||
|
|
||||||
*aChildIdx = parent->GetIndexOfEmbeddedChild(child);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
DocAccessibleChild::RecvChildAtPoint(const uint64_t& aID,
|
DocAccessibleChild::RecvChildAtPoint(const uint64_t& aID,
|
||||||
const int32_t& aX,
|
const int32_t& aX,
|
||||||
|
@ -393,10 +393,6 @@ public:
|
|||||||
|
|
||||||
virtual bool RecvTakeFocus(const uint64_t& aID) override;
|
virtual bool RecvTakeFocus(const uint64_t& aID) override;
|
||||||
|
|
||||||
virtual bool RecvIndexOfEmbeddedChild(const uint64_t& aID,
|
|
||||||
const uint64_t& aChildID,
|
|
||||||
uint32_t* aChildIdx) override final;
|
|
||||||
|
|
||||||
virtual bool RecvChildAtPoint(const uint64_t& aID,
|
virtual bool RecvChildAtPoint(const uint64_t& aID,
|
||||||
const int32_t& aX,
|
const int32_t& aX,
|
||||||
const int32_t& aY,
|
const int32_t& aY,
|
||||||
|
@ -211,8 +211,6 @@ child:
|
|||||||
prio(high) sync Step(uint64_t aID) returns(double aStep);
|
prio(high) sync Step(uint64_t aID) returns(double aStep);
|
||||||
|
|
||||||
prio(high) sync TakeFocus(uint64_t aID);
|
prio(high) sync TakeFocus(uint64_t aID);
|
||||||
prio(high) sync IndexOfEmbeddedChild(uint64_t aID, uint64_t aChildID)
|
|
||||||
returns(uint32_t childIdx);
|
|
||||||
prio(high) sync ChildAtPoint(uint64_t aID, int32_t aX, int32_t aY, uint32_t aWhich)
|
prio(high) sync ChildAtPoint(uint64_t aID, int32_t aX, int32_t aY, uint32_t aWhich)
|
||||||
returns(uint64_t aChild, bool aOk);
|
returns(uint64_t aChild, bool aOk);
|
||||||
prio(high) sync Bounds(uint64_t aID) returns(nsIntRect aRect);
|
prio(high) sync Bounds(uint64_t aID) returns(nsIntRect aRect);
|
||||||
|
@ -903,15 +903,6 @@ ProxyAccessible::TakeFocus()
|
|||||||
unused << mDoc->SendTakeFocus(mID);
|
unused << mDoc->SendTakeFocus(mID);
|
||||||
}
|
}
|
||||||
|
|
||||||
ssize_t
|
|
||||||
ProxyAccessible::IndexOfEmbeddedChild(const ProxyAccessible* aChild)
|
|
||||||
{
|
|
||||||
uint64_t childID = aChild->mID;
|
|
||||||
uint32_t childIdx;
|
|
||||||
unused << mDoc->SendIndexOfEmbeddedChild(mID, childID, &childIdx);
|
|
||||||
return childIdx;
|
|
||||||
}
|
|
||||||
|
|
||||||
ProxyAccessible*
|
ProxyAccessible*
|
||||||
ProxyAccessible::ChildAtPoint(int32_t aX, int32_t aY,
|
ProxyAccessible::ChildAtPoint(int32_t aX, int32_t aY,
|
||||||
Accessible::EWhichChildAtPoint aWhichChild)
|
Accessible::EWhichChildAtPoint aWhichChild)
|
||||||
|
@ -47,7 +47,6 @@ public:
|
|||||||
|
|
||||||
// XXX evaluate if this is fast enough.
|
// XXX evaluate if this is fast enough.
|
||||||
size_t IndexInParent() const { return mParent->mChildren.IndexOf(this); }
|
size_t IndexInParent() const { return mParent->mChildren.IndexOf(this); }
|
||||||
ssize_t IndexOfEmbeddedChild(const ProxyAccessible*);
|
|
||||||
bool MustPruneChildren() const;
|
bool MustPruneChildren() const;
|
||||||
|
|
||||||
void Shutdown();
|
void Shutdown();
|
||||||
@ -321,7 +320,6 @@ enum Interfaces
|
|||||||
VALUE = 8,
|
VALUE = 8,
|
||||||
TABLE = 16,
|
TABLE = 16,
|
||||||
TABLECELL = 32,
|
TABLECELL = 32,
|
||||||
DOCUMENT = 64,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user