зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1831035 part 5: Remove the (now empty) platform specific DocAccessibleChild classes and rename DocAccessibleChildBase to DocAccessibleChild. r=eeejay
Differential Revision: https://phabricator.services.mozilla.com/D181850
This commit is contained in:
Родитель
544fdb5dc4
Коммит
d9633f5b97
|
@ -726,7 +726,7 @@ class Accessible {
|
|||
uint32_t mGenericTypes : kGenericTypesBits;
|
||||
uint8_t mRoleMapEntryIndex;
|
||||
|
||||
friend class DocAccessibleChildBase;
|
||||
friend class DocAccessibleChild;
|
||||
friend class AccGroupInfo;
|
||||
};
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include "AccAttributes.h"
|
||||
#include "CachedTableAccessible.h"
|
||||
#include "DocAccessible-inl.h"
|
||||
#include "DocAccessibleChild.h"
|
||||
#include "EventTree.h"
|
||||
#include "HTMLImageMapAccessible.h"
|
||||
#include "mozilla/ProfilerMarkers.h"
|
||||
|
@ -51,6 +50,7 @@
|
|||
#include "mozilla/ipc/ProcessChild.h"
|
||||
#include "mozilla/PresShell.h"
|
||||
#include "nsAccessibilityService.h"
|
||||
#include "mozilla/a11y/DocAccessibleChild.h"
|
||||
#include "mozilla/a11y/DocAccessibleParent.h"
|
||||
#include "mozilla/dom/AncestorIterator.h"
|
||||
#include "mozilla/dom/BrowserChild.h"
|
||||
|
|
|
@ -613,7 +613,7 @@ class DocAccessible : public HyperTextAccessibleWrap,
|
|||
*/
|
||||
void SetIPCDoc(DocAccessibleChild* aIPCDoc);
|
||||
|
||||
friend class DocAccessibleChildBase;
|
||||
friend class DocAccessibleChild;
|
||||
|
||||
/**
|
||||
* Used to fire scrolling end event after page scroll.
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#include "CachedTableAccessible.h"
|
||||
#include "DocAccessible-inl.h"
|
||||
#include "mozilla/a11y/AccAttributes.h"
|
||||
#include "mozilla/a11y/DocAccessibleChild.h"
|
||||
#include "mozilla/a11y/TableAccessible.h"
|
||||
#include "mozilla/a11y/TableCellAccessible.h"
|
||||
#include "nsAccUtils.h"
|
||||
|
@ -25,7 +26,6 @@
|
|||
#include "NotificationController.h"
|
||||
#include "nsEventShell.h"
|
||||
#include "nsTextEquivUtils.h"
|
||||
#include "DocAccessibleChild.h"
|
||||
#include "EventTree.h"
|
||||
#include "OuterDocAccessible.h"
|
||||
#include "Pivot.h"
|
||||
|
|
|
@ -36,15 +36,6 @@ LOCAL_INCLUDES += [
|
|||
"/layout/xul",
|
||||
]
|
||||
|
||||
if CONFIG["OS_ARCH"] == "WINNT":
|
||||
LOCAL_INCLUDES += [
|
||||
"/accessible/ipc/win",
|
||||
]
|
||||
else:
|
||||
LOCAL_INCLUDES += [
|
||||
"/accessible/ipc/other",
|
||||
]
|
||||
|
||||
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
|
||||
LOCAL_INCLUDES += [
|
||||
"/accessible/atk",
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
* 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 "mozilla/a11y/DocAccessibleChildBase.h"
|
||||
#include "mozilla/a11y/DocAccessibleChild.h"
|
||||
#include "mozilla/a11y/CacheConstants.h"
|
||||
#include "mozilla/a11y/FocusManager.h"
|
||||
#include "mozilla/a11y/RemoteAccessible.h"
|
||||
|
@ -21,8 +21,8 @@ namespace mozilla {
|
|||
namespace a11y {
|
||||
|
||||
/* static */
|
||||
void DocAccessibleChildBase::FlattenTree(LocalAccessible* aRoot,
|
||||
nsTArray<LocalAccessible*>& aTree) {
|
||||
void DocAccessibleChild::FlattenTree(LocalAccessible* aRoot,
|
||||
nsTArray<LocalAccessible*>& aTree) {
|
||||
MOZ_ASSERT(!aRoot->IsDoc(), "documents shouldn't be serialized");
|
||||
|
||||
aTree.AppendElement(aRoot);
|
||||
|
@ -37,8 +37,8 @@ void DocAccessibleChildBase::FlattenTree(LocalAccessible* aRoot,
|
|||
}
|
||||
|
||||
/* static */
|
||||
void DocAccessibleChildBase::SerializeTree(nsTArray<LocalAccessible*>& aTree,
|
||||
nsTArray<AccessibleData>& aData) {
|
||||
void DocAccessibleChild::SerializeTree(nsTArray<LocalAccessible*>& aTree,
|
||||
nsTArray<AccessibleData>& aData) {
|
||||
for (LocalAccessible* acc : aTree) {
|
||||
uint64_t id = reinterpret_cast<uint64_t>(acc->UniqueID());
|
||||
a11y::role role = acc->Role();
|
||||
|
@ -80,10 +80,10 @@ void DocAccessibleChildBase::SerializeTree(nsTArray<LocalAccessible*>& aTree,
|
|||
}
|
||||
}
|
||||
|
||||
void DocAccessibleChildBase::InsertIntoIpcTree(LocalAccessible* aParent,
|
||||
LocalAccessible* aChild,
|
||||
uint32_t aIdxInParent,
|
||||
bool aSuppressShowEvent) {
|
||||
void DocAccessibleChild::InsertIntoIpcTree(LocalAccessible* aParent,
|
||||
LocalAccessible* aChild,
|
||||
uint32_t aIdxInParent,
|
||||
bool aSuppressShowEvent) {
|
||||
uint64_t parentID =
|
||||
aParent->IsDoc() ? 0 : reinterpret_cast<uint64_t>(aParent->UniqueID());
|
||||
nsTArray<LocalAccessible*> shownTree;
|
||||
|
@ -98,14 +98,13 @@ void DocAccessibleChildBase::InsertIntoIpcTree(LocalAccessible* aParent,
|
|||
MaybeSendShowEvent(data, false);
|
||||
}
|
||||
|
||||
void DocAccessibleChildBase::ShowEvent(AccShowEvent* aShowEvent) {
|
||||
void DocAccessibleChild::ShowEvent(AccShowEvent* aShowEvent) {
|
||||
LocalAccessible* child = aShowEvent->GetAccessible();
|
||||
InsertIntoIpcTree(aShowEvent->LocalParent(), child, child->IndexInParent(),
|
||||
false);
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvTakeFocus(
|
||||
const uint64_t& aID) {
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvTakeFocus(const uint64_t& aID) {
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
if (acc) {
|
||||
acc->TakeFocus();
|
||||
|
@ -113,7 +112,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvTakeFocus(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvScrollTo(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvScrollTo(
|
||||
const uint64_t& aID, const uint32_t& aScrollType) {
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
if (acc) {
|
||||
|
@ -125,7 +124,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvScrollTo(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvTakeSelection(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvTakeSelection(
|
||||
const uint64_t& aID) {
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
if (acc) {
|
||||
|
@ -135,7 +134,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvTakeSelection(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvSetSelected(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvSetSelected(
|
||||
const uint64_t& aID, const bool& aSelect) {
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
if (acc) {
|
||||
|
@ -145,7 +144,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvSetSelected(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvVerifyCache(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvVerifyCache(
|
||||
const uint64_t& aID, const uint64_t& aCacheDomain, AccAttributes* aFields) {
|
||||
#ifdef A11Y_LOG
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
|
@ -201,7 +200,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvVerifyCache(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvDoActionAsync(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvDoActionAsync(
|
||||
const uint64_t& aID, const uint8_t& aIndex) {
|
||||
if (LocalAccessible* acc = IdToAccessible(aID)) {
|
||||
Unused << acc->DoAction(aIndex);
|
||||
|
@ -210,7 +209,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvDoActionAsync(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvSetCaretOffset(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvSetCaretOffset(
|
||||
const uint64_t& aID, const int32_t& aOffset) {
|
||||
HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
|
||||
if (acc && acc->IsTextRole() && acc->IsValidOffset(aOffset)) {
|
||||
|
@ -219,7 +218,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvSetCaretOffset(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvSetTextSelection(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvSetTextSelection(
|
||||
const uint64_t& aStartID, const int32_t& aStartOffset,
|
||||
const uint64_t& aEndID, const int32_t& aEndOffset,
|
||||
const int32_t& aSelectionNum) {
|
||||
|
@ -232,7 +231,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvSetTextSelection(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvScrollTextLeafRangeIntoView(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvScrollTextLeafRangeIntoView(
|
||||
const uint64_t& aStartID, const int32_t& aStartOffset,
|
||||
const uint64_t& aEndID, const int32_t& aEndOffset,
|
||||
const uint32_t& aScrollType) {
|
||||
|
@ -245,7 +244,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvScrollTextLeafRangeIntoView(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvRemoveTextSelection(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvRemoveTextSelection(
|
||||
const uint64_t& aID, const int32_t& aSelectionNum) {
|
||||
HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
|
||||
if (acc && acc->IsTextRole()) {
|
||||
|
@ -255,7 +254,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvRemoveTextSelection(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvSetCurValue(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvSetCurValue(
|
||||
const uint64_t& aID, const double& aValue) {
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
if (acc) {
|
||||
|
@ -265,7 +264,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvSetCurValue(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvReplaceText(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvReplaceText(
|
||||
const uint64_t& aID, const nsAString& aText) {
|
||||
HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
|
||||
if (acc && acc->IsTextRole()) {
|
||||
|
@ -275,7 +274,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvReplaceText(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvInsertText(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvInsertText(
|
||||
const uint64_t& aID, const nsAString& aText, const int32_t& aPosition) {
|
||||
HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
|
||||
if (acc && acc->IsTextRole()) {
|
||||
|
@ -285,7 +284,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvInsertText(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvCopyText(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvCopyText(
|
||||
const uint64_t& aID, const int32_t& aStartPos, const int32_t& aEndPos) {
|
||||
HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
|
||||
if (acc && acc->IsTextRole()) {
|
||||
|
@ -295,7 +294,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvCopyText(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvCutText(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvCutText(
|
||||
const uint64_t& aID, const int32_t& aStartPos, const int32_t& aEndPos) {
|
||||
HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
|
||||
if (acc && acc->IsTextRole()) {
|
||||
|
@ -305,7 +304,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvCutText(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvDeleteText(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvDeleteText(
|
||||
const uint64_t& aID, const int32_t& aStartPos, const int32_t& aEndPos) {
|
||||
HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
|
||||
if (acc && acc->IsTextRole()) {
|
||||
|
@ -315,7 +314,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvDeleteText(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvPasteText(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvPasteText(
|
||||
const uint64_t& aID, const int32_t& aPosition) {
|
||||
RefPtr<HyperTextAccessible> acc = IdToHyperTextAccessible(aID);
|
||||
if (acc && acc->IsTextRole()) {
|
||||
|
@ -325,7 +324,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvPasteText(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
ipc::IPCResult DocAccessibleChildBase::RecvRestoreFocus() {
|
||||
ipc::IPCResult DocAccessibleChild::RecvRestoreFocus() {
|
||||
if (FocusManager* focusMgr = FocusMgr()) {
|
||||
focusMgr->ForceFocusEvent();
|
||||
}
|
||||
|
@ -333,8 +332,7 @@ ipc::IPCResult DocAccessibleChildBase::RecvRestoreFocus() {
|
|||
}
|
||||
|
||||
#if defined(XP_WIN)
|
||||
LayoutDeviceIntRect DocAccessibleChildBase::GetCaretRectFor(
|
||||
const uint64_t& aID) {
|
||||
LayoutDeviceIntRect DocAccessibleChild::GetCaretRectFor(const uint64_t& aID) {
|
||||
LocalAccessible* target;
|
||||
|
||||
if (aID) {
|
||||
|
@ -354,21 +352,22 @@ LayoutDeviceIntRect DocAccessibleChildBase::GetCaretRectFor(
|
|||
return text->GetCaretRect(&widget);
|
||||
}
|
||||
|
||||
bool DocAccessibleChildBase::SendFocusEvent(const uint64_t& aID) {
|
||||
bool DocAccessibleChild::SendFocusEvent(const uint64_t& aID) {
|
||||
return PDocAccessibleChild::SendFocusEvent(aID, GetCaretRectFor(aID));
|
||||
}
|
||||
|
||||
bool DocAccessibleChildBase::SendCaretMoveEvent(
|
||||
const uint64_t& aID, const int32_t& aOffset,
|
||||
const bool& aIsSelectionCollapsed, const bool& aIsAtEndOfLine,
|
||||
const int32_t& aGranularity) {
|
||||
bool DocAccessibleChild::SendCaretMoveEvent(const uint64_t& aID,
|
||||
const int32_t& aOffset,
|
||||
const bool& aIsSelectionCollapsed,
|
||||
const bool& aIsAtEndOfLine,
|
||||
const int32_t& aGranularity) {
|
||||
return PDocAccessibleChild::SendCaretMoveEvent(aID, GetCaretRectFor(aID),
|
||||
aOffset, aIsSelectionCollapsed,
|
||||
aIsAtEndOfLine, aGranularity);
|
||||
}
|
||||
|
||||
#else // defined(XP_WIN)
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvScrollToPoint(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvScrollToPoint(
|
||||
const uint64_t& aID, const uint32_t& aScrollType, const int32_t& aX,
|
||||
const int32_t& aY) {
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
|
@ -379,7 +378,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvScrollToPoint(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvAnnounce(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvAnnounce(
|
||||
const uint64_t& aID, const nsAString& aAnnouncement,
|
||||
const uint16_t& aPriority) {
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
|
@ -390,7 +389,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvAnnounce(
|
|||
return IPC_OK();
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult DocAccessibleChildBase::RecvScrollSubstringToPoint(
|
||||
mozilla::ipc::IPCResult DocAccessibleChild::RecvScrollSubstringToPoint(
|
||||
const uint64_t& aID, const int32_t& aStartOffset, const int32_t& aEndOffset,
|
||||
const uint32_t& aCoordinateType, const int32_t& aX, const int32_t& aY) {
|
||||
HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
|
||||
|
@ -403,8 +402,7 @@ mozilla::ipc::IPCResult DocAccessibleChildBase::RecvScrollSubstringToPoint(
|
|||
}
|
||||
#endif // defined(XP_WIN)
|
||||
|
||||
LocalAccessible* DocAccessibleChildBase::IdToAccessible(
|
||||
const uint64_t& aID) const {
|
||||
LocalAccessible* DocAccessibleChild::IdToAccessible(const uint64_t& aID) const {
|
||||
if (!aID) return mDoc;
|
||||
|
||||
if (!mDoc) return nullptr;
|
||||
|
@ -412,7 +410,7 @@ LocalAccessible* DocAccessibleChildBase::IdToAccessible(
|
|||
return mDoc->GetAccessibleByUniqueID(reinterpret_cast<void*>(aID));
|
||||
}
|
||||
|
||||
HyperTextAccessible* DocAccessibleChildBase::IdToHyperTextAccessible(
|
||||
HyperTextAccessible* DocAccessibleChild::IdToHyperTextAccessible(
|
||||
const uint64_t& aID) const {
|
||||
LocalAccessible* acc = IdToAccessible(aID);
|
||||
return acc && acc->IsHyperText() ? acc->AsHyperText() : nullptr;
|
|
@ -4,8 +4,8 @@
|
|||
* 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/. */
|
||||
|
||||
#ifndef mozilla_a11y_DocAccessibleChildBase_h
|
||||
#define mozilla_a11y_DocAccessibleChildBase_h
|
||||
#ifndef mozilla_a11y_DocAccessibleChild_h
|
||||
#define mozilla_a11y_DocAccessibleChild_h
|
||||
|
||||
#include "mozilla/a11y/DocAccessible.h"
|
||||
#include "mozilla/a11y/PDocAccessibleChild.h"
|
||||
|
@ -18,13 +18,18 @@ namespace a11y {
|
|||
class LocalAccessible;
|
||||
class AccShowEvent;
|
||||
|
||||
class DocAccessibleChildBase : public PDocAccessibleChild {
|
||||
/**
|
||||
* These objects handle content side communication for an accessible document,
|
||||
* and their lifetime is the same as the document they represent.
|
||||
*/
|
||||
class DocAccessibleChild : public PDocAccessibleChild {
|
||||
public:
|
||||
explicit DocAccessibleChildBase(DocAccessible* aDoc) : mDoc(aDoc) {
|
||||
MOZ_COUNT_CTOR(DocAccessibleChildBase);
|
||||
DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager) : mDoc(aDoc) {
|
||||
MOZ_COUNT_CTOR(DocAccessibleChild);
|
||||
SetManager(aManager);
|
||||
}
|
||||
|
||||
~DocAccessibleChildBase() {
|
||||
~DocAccessibleChild() {
|
||||
// Shutdown() should have been called, but maybe it isn't if the process is
|
||||
// killed?
|
||||
MOZ_ASSERT(!mDoc);
|
||||
|
@ -32,7 +37,7 @@ class DocAccessibleChildBase : public PDocAccessibleChild {
|
|||
mDoc->SetIPCDoc(nullptr);
|
||||
}
|
||||
|
||||
MOZ_COUNT_DTOR(DocAccessibleChildBase);
|
||||
MOZ_COUNT_DTOR(DocAccessibleChild);
|
||||
}
|
||||
|
||||
virtual void Shutdown() {
|
||||
|
@ -175,4 +180,4 @@ class DocAccessibleChildBase : public PDocAccessibleChild {
|
|||
} // namespace a11y
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_a11y_DocAccessibleChildBase_h
|
||||
#endif // mozilla_a11y_DocAccessibleChild_h
|
|
@ -43,14 +43,14 @@ EXPORTS.mozilla.a11y += [
|
|||
|
||||
if CONFIG["ACCESSIBILITY"]:
|
||||
EXPORTS.mozilla.a11y += [
|
||||
"DocAccessibleChildBase.h",
|
||||
"DocAccessibleChild.h",
|
||||
"DocAccessibleParent.h",
|
||||
"RemoteAccessibleBase.h",
|
||||
"RemoteAccessibleShared.h",
|
||||
]
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
"DocAccessibleChildBase.cpp",
|
||||
"DocAccessibleChild.cpp",
|
||||
"DocAccessibleParent.cpp",
|
||||
"RemoteAccessibleBase.cpp",
|
||||
]
|
||||
|
|
|
@ -1,35 +0,0 @@
|
|||
/* -*- 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/. */
|
||||
|
||||
#ifndef mozilla_a11y_DocAccessibleChild_h
|
||||
#define mozilla_a11y_DocAccessibleChild_h
|
||||
|
||||
#include "mozilla/a11y/DocAccessibleChildBase.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
||||
/*
|
||||
* These objects handle content side communication for an accessible document,
|
||||
* and their lifetime is the same as the document they represent.
|
||||
*/
|
||||
class DocAccessibleChild : public DocAccessibleChildBase {
|
||||
public:
|
||||
DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager)
|
||||
: DocAccessibleChildBase(aDoc) {
|
||||
MOZ_COUNT_CTOR_INHERITED(DocAccessibleChild, DocAccessibleChildBase);
|
||||
SetManager(aManager);
|
||||
}
|
||||
|
||||
~DocAccessibleChild() {
|
||||
MOZ_COUNT_DTOR_INHERITED(DocAccessibleChild, DocAccessibleChildBase);
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace a11y
|
||||
} // namespace mozilla
|
||||
|
||||
#endif
|
|
@ -7,7 +7,6 @@
|
|||
|
||||
if CONFIG["ACCESSIBILITY"]:
|
||||
EXPORTS.mozilla.a11y += [
|
||||
"DocAccessibleChild.h",
|
||||
"RemoteAccessible.h",
|
||||
]
|
||||
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
/* -*- 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 "DocAccessibleChild.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
||||
DocAccessibleChild::DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager)
|
||||
: DocAccessibleChildBase(aDoc) {
|
||||
MOZ_COUNT_CTOR_INHERITED(DocAccessibleChild, DocAccessibleChildBase);
|
||||
SetManager(aManager);
|
||||
}
|
||||
|
||||
DocAccessibleChild::~DocAccessibleChild() {
|
||||
MOZ_COUNT_DTOR_INHERITED(DocAccessibleChild, DocAccessibleChildBase);
|
||||
}
|
||||
|
||||
} // namespace a11y
|
||||
} // namespace mozilla
|
|
@ -1,28 +0,0 @@
|
|||
/* -*- 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/. */
|
||||
|
||||
#ifndef mozilla_a11y_DocAccessibleChild_h
|
||||
#define mozilla_a11y_DocAccessibleChild_h
|
||||
|
||||
#include "mozilla/a11y/DocAccessibleChildBase.h"
|
||||
|
||||
namespace mozilla {
|
||||
namespace a11y {
|
||||
|
||||
/*
|
||||
* These objects handle content side communication for an accessible document,
|
||||
* and their lifetime is the same as the document they represent.
|
||||
*/
|
||||
class DocAccessibleChild : public DocAccessibleChildBase {
|
||||
public:
|
||||
DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager);
|
||||
~DocAccessibleChild();
|
||||
};
|
||||
|
||||
} // namespace a11y
|
||||
} // namespace mozilla
|
||||
|
||||
#endif // mozilla_a11y_DocAccessibleChild_h
|
|
@ -6,14 +6,9 @@
|
|||
|
||||
if CONFIG["ACCESSIBILITY"]:
|
||||
EXPORTS.mozilla.a11y += [
|
||||
"DocAccessibleChild.h",
|
||||
"RemoteAccessible.h",
|
||||
]
|
||||
|
||||
SOURCES += [
|
||||
"DocAccessibleChild.cpp",
|
||||
]
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
"/accessible/base",
|
||||
"/accessible/generic",
|
||||
|
|
Загрузка…
Ссылка в новой задаче