Skip to content

Commit

Permalink
Bug 1693597 - P2: Rename ProxyAccessible to RemoteAccessible. r=morgan
Browse files Browse the repository at this point in the history 
Differential Revision: https://phabricator.services.mozilla.com/D105671
  • Loading branch information
@eeejay
eeejay committed Feb 19, 2021
1 parent dea855e commit 27db02d
Show file tree
Hide file tree
Showing 83 changed files with 812 additions and 797 deletions.
4 changes: 2 additions & 2 deletions accessible/android/AccessibleWrap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define mozilla_a11y_AccessibleWrap_h_

#include "LocalAccessible.h"
#include "mozilla/a11y/ProxyAccessible.h"
#include "mozilla/a11y/RemoteAccessible.h"
#include "mozilla/java/GeckoBundleWrappers.h"
#include "mozilla/java/SessionAccessibilityWrappers.h"
#include "nsCOMPtr.h"
Expand Down Expand Up @@ -112,7 +112,7 @@ class AccessibleWrap : public LocalAccessible {
static uint32_t GetFlags(role aRole, uint64_t aState, uint8_t aActionCount);
};

static inline AccessibleWrap* WrapperFor(const ProxyAccessible* aProxy) {
static inline AccessibleWrap* WrapperFor(const RemoteAccessible* aProxy) {
return reinterpret_cast<AccessibleWrap*>(aProxy->GetWrapper());
}

Expand Down
39 changes: 20 additions & 19 deletions accessible/android/Platform.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#include "Platform.h"
#include "ProxyAccessibleWrap.h"
#include "RemoteAccessibleWrap.h"
#include "DocAccessibleWrap.h"
#include "SessionAccessibility.h"
#include "mozilla/a11y/ProxyAccessible.h"
#include "mozilla/a11y/RemoteAccessible.h"
#include "mozilla/Components.h"
#include "nsIAccessibleEvent.h"
#include "nsIAccessiblePivot.h"
Expand All @@ -25,19 +25,19 @@ void a11y::PlatformInit() {}

void a11y::PlatformShutdown() { NS_IF_RELEASE(sStringBundle); }

void a11y::ProxyCreated(ProxyAccessible* aProxy, uint32_t aInterfaces) {
void a11y::ProxyCreated(RemoteAccessible* aProxy, uint32_t aInterfaces) {
AccessibleWrap* wrapper = nullptr;
if (aProxy->IsDoc()) {
wrapper = new DocProxyAccessibleWrap(aProxy->AsDoc());
wrapper = new DocRemoteAccessibleWrap(aProxy->AsDoc());
} else {
wrapper = new ProxyAccessibleWrap(aProxy);
wrapper = new RemoteAccessibleWrap(aProxy);
}

wrapper->AddRef();
aProxy->SetWrapper(reinterpret_cast<uintptr_t>(wrapper));
}

void a11y::ProxyDestroyed(ProxyAccessible* aProxy) {
void a11y::ProxyDestroyed(RemoteAccessible* aProxy) {
AccessibleWrap* wrapper =
reinterpret_cast<AccessibleWrap*>(aProxy->GetWrapper());

Expand All @@ -53,7 +53,7 @@ void a11y::ProxyDestroyed(ProxyAccessible* aProxy) {
wrapper->Release();
}

void a11y::ProxyEvent(ProxyAccessible* aTarget, uint32_t aEventType) {
void a11y::ProxyEvent(RemoteAccessible* aTarget, uint32_t aEventType) {
RefPtr<SessionAccessibility> sessionAcc =
SessionAccessibility::GetInstanceFor(aTarget);
if (!sessionAcc) {
Expand All @@ -67,7 +67,7 @@ void a11y::ProxyEvent(ProxyAccessible* aTarget, uint32_t aEventType) {
}
}

void a11y::ProxyStateChangeEvent(ProxyAccessible* aTarget, uint64_t aState,
void a11y::ProxyStateChangeEvent(RemoteAccessible* aTarget, uint64_t aState,
bool aEnabled) {
RefPtr<SessionAccessibility> sessionAcc =
SessionAccessibility::GetInstanceFor(aTarget);
Expand Down Expand Up @@ -99,7 +99,7 @@ void a11y::ProxyStateChangeEvent(ProxyAccessible* aTarget, uint64_t aState,
}
}

void a11y::ProxyCaretMoveEvent(ProxyAccessible* aTarget, int32_t aOffset,
void a11y::ProxyCaretMoveEvent(RemoteAccessible* aTarget, int32_t aOffset,
bool aIsSelectionCollapsed) {
RefPtr<SessionAccessibility> sessionAcc =
SessionAccessibility::GetInstanceFor(aTarget);
Expand All @@ -109,7 +109,7 @@ void a11y::ProxyCaretMoveEvent(ProxyAccessible* aTarget, int32_t aOffset,
}
}

void a11y::ProxyTextChangeEvent(ProxyAccessible* aTarget, const nsString& aStr,
void a11y::ProxyTextChangeEvent(RemoteAccessible* aTarget, const nsString& aStr,
int32_t aStart, uint32_t aLen, bool aIsInsert,
bool aFromUser) {
RefPtr<SessionAccessibility> sessionAcc =
Expand All @@ -121,19 +121,20 @@ void a11y::ProxyTextChangeEvent(ProxyAccessible* aTarget, const nsString& aStr,
}
}

void a11y::ProxyShowHideEvent(ProxyAccessible* aTarget,
ProxyAccessible* aParent, bool aInsert,
void a11y::ProxyShowHideEvent(RemoteAccessible* aTarget,
RemoteAccessible* aParent, bool aInsert,
bool aFromUser) {
// We rely on the window content changed events to be dispatched
// after the viewport cache is refreshed.
}

void a11y::ProxySelectionEvent(ProxyAccessible*, ProxyAccessible*, uint32_t) {}
void a11y::ProxySelectionEvent(RemoteAccessible*, RemoteAccessible*, uint32_t) {
}

void a11y::ProxyVirtualCursorChangeEvent(
ProxyAccessible* aTarget, ProxyAccessible* aOldPosition,
RemoteAccessible* aTarget, RemoteAccessible* aOldPosition,
int32_t aOldStartOffset, int32_t aOldEndOffset,
ProxyAccessible* aNewPosition, int32_t aNewStartOffset,
RemoteAccessible* aNewPosition, int32_t aNewStartOffset,
int32_t aNewEndOffset, int16_t aReason, int16_t aBoundaryType,
bool aFromUser) {
if (!aNewPosition || !aFromUser) {
Expand All @@ -160,7 +161,7 @@ void a11y::ProxyVirtualCursorChangeEvent(
}
}

void a11y::ProxyScrollingEvent(ProxyAccessible* aTarget, uint32_t aEventType,
void a11y::ProxyScrollingEvent(RemoteAccessible* aTarget, uint32_t aEventType,
uint32_t aScrollX, uint32_t aScrollY,
uint32_t aMaxScrollX, uint32_t aMaxScrollY) {
if (aEventType == nsIAccessibleEvent::EVENT_SCROLLING) {
Expand All @@ -174,7 +175,7 @@ void a11y::ProxyScrollingEvent(ProxyAccessible* aTarget, uint32_t aEventType,
}
}

void a11y::ProxyAnnouncementEvent(ProxyAccessible* aTarget,
void a11y::ProxyAnnouncementEvent(RemoteAccessible* aTarget,
const nsString& aAnnouncement,
uint16_t aPriority) {
RefPtr<SessionAccessibility> sessionAcc =
Expand All @@ -186,8 +187,8 @@ void a11y::ProxyAnnouncementEvent(ProxyAccessible* aTarget,
}
}

void a11y::ProxyBatch(ProxyAccessible* aDocument, const uint64_t aBatchType,
const nsTArray<ProxyAccessible*>& aAccessibles,
void a11y::ProxyBatch(RemoteAccessible* aDocument, const uint64_t aBatchType,
const nsTArray<RemoteAccessible*>& aAccessibles,
const nsTArray<BatchData>& aData) {
RefPtr<SessionAccessibility> sessionAcc =
SessionAccessibility::GetInstanceFor(aDocument);
Expand Down
73 changes: 37 additions & 36 deletions accessible/android/ProxyAccessibleWrap.cpp → accessible/android/RemoteAccessibleWrap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,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 "ProxyAccessibleWrap.h"
#include "RemoteAccessibleWrap.h"
#include "LocalAccessible-inl.h"

#include "nsPersistentProperties.h"
Expand All @@ -12,7 +12,7 @@

using namespace mozilla::a11y;

ProxyAccessibleWrap::ProxyAccessibleWrap(ProxyAccessible* aProxy)
RemoteAccessibleWrap::RemoteAccessibleWrap(RemoteAccessible* aProxy)
: AccessibleWrap(nullptr, nullptr) {
mType = eProxyType;
mBits.proxy = aProxy;
Expand All @@ -29,16 +29,16 @@ ProxyAccessibleWrap::ProxyAccessibleWrap(ProxyAccessible* aProxy)
mGenericTypes |= eHyperText;
}

auto doc = reinterpret_cast<DocProxyAccessibleWrap*>(
auto doc = reinterpret_cast<DocRemoteAccessibleWrap*>(
Proxy()->Document()->GetWrapper());
if (doc) {
mID = AcquireID();
doc->AddID(mID, this);
}
}

void ProxyAccessibleWrap::Shutdown() {
auto doc = reinterpret_cast<DocProxyAccessibleWrap*>(
void RemoteAccessibleWrap::Shutdown() {
auto doc = reinterpret_cast<DocRemoteAccessibleWrap*>(
Proxy()->Document()->GetWrapper());
if (mID && doc) {
doc->RemoveID(mID);
Expand All @@ -52,112 +52,113 @@ void ProxyAccessibleWrap::Shutdown() {

// LocalAccessible

already_AddRefed<nsIPersistentProperties> ProxyAccessibleWrap::Attributes() {
already_AddRefed<nsIPersistentProperties> RemoteAccessibleWrap::Attributes() {
AutoTArray<Attribute, 10> attrs;
Proxy()->Attributes(&attrs);
return AttributeArrayToProperties(attrs);
}

uint32_t ProxyAccessibleWrap::ChildCount() const {
uint32_t RemoteAccessibleWrap::ChildCount() const {
return Proxy()->ChildrenCount();
}

LocalAccessible* ProxyAccessibleWrap::LocalChildAt(uint32_t aIndex) const {
ProxyAccessible* child = Proxy()->RemoteChildAt(aIndex);
LocalAccessible* RemoteAccessibleWrap::LocalChildAt(uint32_t aIndex) const {
RemoteAccessible* child = Proxy()->RemoteChildAt(aIndex);
return child ? WrapperFor(child) : nullptr;
}

ENameValueFlag ProxyAccessibleWrap::Name(nsString& aName) const {
ENameValueFlag RemoteAccessibleWrap::Name(nsString& aName) const {
Proxy()->Name(aName);
return eNameOK;
}

void ProxyAccessibleWrap::Value(nsString& aValue) const {
void RemoteAccessibleWrap::Value(nsString& aValue) const {
Proxy()->Value(aValue);
}

uint64_t ProxyAccessibleWrap::State() { return Proxy()->State(); }
uint64_t RemoteAccessibleWrap::State() { return Proxy()->State(); }

nsIntRect ProxyAccessibleWrap::Bounds() const { return Proxy()->Bounds(); }
nsIntRect RemoteAccessibleWrap::Bounds() const { return Proxy()->Bounds(); }

void ProxyAccessibleWrap::ScrollTo(uint32_t aHow) const {
void RemoteAccessibleWrap::ScrollTo(uint32_t aHow) const {
Proxy()->ScrollTo(aHow);
}

uint8_t ProxyAccessibleWrap::ActionCount() const {
uint8_t RemoteAccessibleWrap::ActionCount() const {
return Proxy()->ActionCount();
}

bool ProxyAccessibleWrap::DoAction(uint8_t aIndex) const {
bool RemoteAccessibleWrap::DoAction(uint8_t aIndex) const {
return Proxy()->DoAction(aIndex);
}

// Other

void ProxyAccessibleWrap::SetTextContents(const nsAString& aText) {
void RemoteAccessibleWrap::SetTextContents(const nsAString& aText) {
Proxy()->ReplaceText(PromiseFlatString(aText));
}

void ProxyAccessibleWrap::GetTextContents(nsAString& aText) {
void RemoteAccessibleWrap::GetTextContents(nsAString& aText) {
nsAutoString text;
Proxy()->TextSubstring(0, -1, text);
aText.Assign(text);
}

bool ProxyAccessibleWrap::GetSelectionBounds(int32_t* aStartOffset,
int32_t* aEndOffset) {
bool RemoteAccessibleWrap::GetSelectionBounds(int32_t* aStartOffset,
int32_t* aEndOffset) {
nsAutoString unused;
return Proxy()->SelectionBoundsAt(0, unused, aStartOffset, aEndOffset);
}

void ProxyAccessibleWrap::PivotTo(int32_t aGranularity, bool aForward,
bool aInclusive) {
void RemoteAccessibleWrap::PivotTo(int32_t aGranularity, bool aForward,
bool aInclusive) {
Unused << Proxy()->Document()->GetPlatformExtension()->SendPivot(
Proxy()->ID(), aGranularity, aForward, aInclusive);
}

void ProxyAccessibleWrap::ExploreByTouch(float aX, float aY) {
void RemoteAccessibleWrap::ExploreByTouch(float aX, float aY) {
Unused << Proxy()->Document()->GetPlatformExtension()->SendExploreByTouch(
Proxy()->ID(), aX, aY);
}

void ProxyAccessibleWrap::NavigateText(int32_t aGranularity,
int32_t aStartOffset, int32_t aEndOffset,
bool aForward, bool aSelect) {
void RemoteAccessibleWrap::NavigateText(int32_t aGranularity,
int32_t aStartOffset,
int32_t aEndOffset, bool aForward,
bool aSelect) {
Unused << Proxy()->Document()->GetPlatformExtension()->SendNavigateText(
Proxy()->ID(), aGranularity, aStartOffset, aEndOffset, aForward, aSelect);
}

void ProxyAccessibleWrap::SetSelection(int32_t aStart, int32_t aEnd) {
void RemoteAccessibleWrap::SetSelection(int32_t aStart, int32_t aEnd) {
Unused << Proxy()->Document()->GetPlatformExtension()->SendSetSelection(
Proxy()->ID(), aStart, aEnd);
}

void ProxyAccessibleWrap::Cut() {
void RemoteAccessibleWrap::Cut() {
Unused << Proxy()->Document()->GetPlatformExtension()->SendCut(Proxy()->ID());
}

void ProxyAccessibleWrap::Copy() {
void RemoteAccessibleWrap::Copy() {
Unused << Proxy()->Document()->GetPlatformExtension()->SendCopy(
Proxy()->ID());
}

void ProxyAccessibleWrap::Paste() {
void RemoteAccessibleWrap::Paste() {
Unused << Proxy()->Document()->GetPlatformExtension()->SendPaste(
Proxy()->ID());
}

role ProxyAccessibleWrap::WrapperRole() { return Proxy()->Role(); }
role RemoteAccessibleWrap::WrapperRole() { return Proxy()->Role(); }

AccessibleWrap* ProxyAccessibleWrap::WrapperParent() {
AccessibleWrap* RemoteAccessibleWrap::WrapperParent() {
return Proxy()->RemoteParent() ? WrapperFor(Proxy()->RemoteParent())
: nullptr;
}

bool ProxyAccessibleWrap::WrapperRangeInfo(double* aCurVal, double* aMinVal,
double* aMaxVal, double* aStep) {
bool RemoteAccessibleWrap::WrapperRangeInfo(double* aCurVal, double* aMinVal,
double* aMaxVal, double* aStep) {
if (HasNumericValue()) {
ProxyAccessible* proxy = Proxy();
RemoteAccessible* proxy = Proxy();
*aCurVal = proxy->CurValue();
*aMinVal = proxy->MinValue();
*aMaxVal = proxy->MaxValue();
Expand All @@ -168,6 +169,6 @@ bool ProxyAccessibleWrap::WrapperRangeInfo(double* aCurVal, double* aMinVal,
return false;
}

void ProxyAccessibleWrap::WrapperDOMNodeID(nsString& aDOMNodeID) {
void RemoteAccessibleWrap::WrapperDOMNodeID(nsString& aDOMNodeID) {
Proxy()->DOMNodeID(aDOMNodeID);
}
22 changes: 11 additions & 11 deletions accessible/android/ProxyAccessibleWrap.h → accessible/android/RemoteAccessibleWrap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. *
*/

#ifndef MOZILLA_A11Y_ProxyAccessibleWrap_h
#define MOZILLA_A11Y_ProxyAccessibleWrap_h
#ifndef MOZILLA_A11Y_RemoteAccessibleWrap_h
#define MOZILLA_A11Y_RemoteAccessibleWrap_h

#include "AccessibleWrap.h"
#include "DocAccessibleParent.h"
Expand All @@ -21,9 +21,9 @@ namespace a11y {
* a local or remote accessibles. NOTE: This shouldn't be regarded as a full
* Accessible implementation.
*/
class ProxyAccessibleWrap : public AccessibleWrap {
class RemoteAccessibleWrap : public AccessibleWrap {
public:
explicit ProxyAccessibleWrap(ProxyAccessible* aProxy);
explicit RemoteAccessibleWrap(RemoteAccessible* aProxy);

virtual void Shutdown() override;

Expand Down Expand Up @@ -87,10 +87,10 @@ class ProxyAccessibleWrap : public AccessibleWrap {
double* aMaxVal, double* aStep) override;
};

class DocProxyAccessibleWrap : public ProxyAccessibleWrap {
class DocRemoteAccessibleWrap : public RemoteAccessibleWrap {
public:
explicit DocProxyAccessibleWrap(DocAccessibleParent* aProxy)
: ProxyAccessibleWrap(aProxy) {
explicit DocRemoteAccessibleWrap(DocAccessibleParent* aProxy)
: RemoteAccessibleWrap(aProxy) {
mGenericTypes |= eDocument;

if (aProxy->IsTopLevel()) {
Expand All @@ -113,20 +113,20 @@ class DocProxyAccessibleWrap : public ProxyAccessibleWrap {
mStateFlags |= eIsDefunct;
}

DocProxyAccessibleWrap* ParentDocument() {
DocRemoteAccessibleWrap* ParentDocument() {
DocAccessibleParent* proxy = static_cast<DocAccessibleParent*>(Proxy());
MOZ_ASSERT(proxy);
if (DocAccessibleParent* parent = proxy->ParentDoc()) {
return reinterpret_cast<DocProxyAccessibleWrap*>(parent->GetWrapper());
return reinterpret_cast<DocRemoteAccessibleWrap*>(parent->GetWrapper());
}

return nullptr;
}

DocProxyAccessibleWrap* GetChildDocumentAt(uint32_t aIndex) {
DocRemoteAccessibleWrap* GetChildDocumentAt(uint32_t aIndex) {
auto doc = Proxy()->AsDoc();
if (doc && doc->ChildDocCount() > aIndex) {
return reinterpret_cast<DocProxyAccessibleWrap*>(
return reinterpret_cast<DocRemoteAccessibleWrap*>(
doc->ChildDocAt(aIndex)->GetWrapper());
}

Expand Down
Loading

0 comments on commit 27db02d

Please sign in to comment.