Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 7d3a598c1285 (bug 1499209),for Android build bustages on AccessibleWrap.cpp:416

Browse Source
This commit is contained in:
arthur.iakab 2018-10-19 01:26:11 +03:00
parent 0bb3246aa5
commit 83433f41f3
3 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
accessible/android/AccessibleWrap.cpp
View File

@ -373,7 +373,7 @@ AccessibleWrap::WrapperRangeInfo(double* aCurVal, double* aMinVal,
}
mozilla::java::GeckoBundle::LocalRef
AccessibleWrap::ToBundle(bool aMinimal)
AccessibleWrap::ToBundle()
{
if (IsDefunct()) {
return nullptr;
@ -390,6 +390,16 @@ AccessibleWrap::ToBundle(bool aMinimal)
uint64_t state = State();
uint64_t flags = GetFlags(role, state);
GECKOBUNDLE_PUT(nodeInfo, "flags", java::sdk::Integer::ValueOf(flags));
nsAutoString geckoRole;
nsAutoString roleDescription;
if (VirtualViewID() != kNoID) {
GetRoleDescription(role, geckoRole, roleDescription);
}
GECKOBUNDLE_PUT(
nodeInfo, "roleDescription", jni::StringParam(roleDescription));
GECKOBUNDLE_PUT(nodeInfo, "geckoRole", jni::StringParam(geckoRole));
GECKOBUNDLE_PUT(nodeInfo, "className", java::sdk::Integer::ValueOf(AndroidClass()));
nsAutoString text;
@ -406,26 +416,6 @@ AccessibleWrap::ToBundle(bool aMinimal)
}
GECKOBUNDLE_PUT(nodeInfo, "text", jni::StringParam(text));
if (aMinimal) {
GECKOBUNDLE_FINISH(nodeInfo);
return nodeInfo;
}
nsAutoString geckoRole;
nsAutoString roleDescription;
int32_t androidClass = java::SessionAccessibility::CLASSNAME_VIEW;
if (VirtualViewID() != kNoID) {
GetRoleDescription(role, geckoRole, roleDescription);
}
GECKOBUNDLE_PUT(
nodeInfo, "roleDescription", jni::StringParam(roleDescription));
GECKOBUNDLE_PUT(nodeInfo, "geckoRole", jni::StringParam(geckoRole));
GECKOBUNDLE_PUT(
nodeInfo, "roleDescription", jni::StringParam(roleDescription));
GECKOBUNDLE_PUT(nodeInfo, "geckoRole", jni::StringParam(geckoRole));
nsAutoString viewIdResourceName;
WrapperDOMNodeID(viewIdResourceName);
if (!viewIdResourceName.IsEmpty()) {

2
accessible/android/AccessibleWrap.h
View File

@ -31,7 +31,7 @@ public:
virtual bool GetSelectionBounds(int32_t* aStartOffset, int32_t* aEndOffset);
mozilla::java::GeckoBundle::LocalRef ToBundle(bool aMinimal = false);
mozilla::java::GeckoBundle::LocalRef ToBundle();
int32_t AndroidClass()
{

24
accessible/android/SessionAccessibility.cpp
View File

@ -151,7 +151,7 @@ SessionAccessibility::SendAccessibilityFocusedEvent(AccessibleWrap* aAccessible)
{
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_VIEW_ACCESSIBILITY_FOCUSED,
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle());
aAccessible->ScrollTo(nsIAccessibleScrollType::SCROLL_TYPE_ANYWHERE);
}
@ -160,7 +160,7 @@ SessionAccessibility::SendHoverEnterEvent(AccessibleWrap* aAccessible)
{
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_VIEW_HOVER_ENTER,
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle());
}
void
@ -174,7 +174,7 @@ SessionAccessibility::SendFocusEvent(AccessibleWrap* aAccessible)
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_VIEW_FOCUSED,
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle());
}
void
@ -199,8 +199,8 @@ SessionAccessibility::SendScrollingEvent(AccessibleWrap* aAccessible,
GECKOBUNDLE_FINISH(eventInfo);
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_VIEW_SCROLLED, virtualViewId, eventInfo,
aAccessible->ToBundle(true));
java::sdk::AccessibilityEvent::TYPE_VIEW_SCROLLED, virtualViewId,
eventInfo, aAccessible->ToBundle());
SendWindowContentChangedEvent(aAccessible);
}
@ -210,7 +210,7 @@ SessionAccessibility::SendWindowContentChangedEvent(AccessibleWrap* aAccessible)
{
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_WINDOW_CONTENT_CHANGED,
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle());
}
void
@ -224,7 +224,7 @@ SessionAccessibility::SendWindowStateChangedEvent(AccessibleWrap* aAccessible)
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_WINDOW_STATE_CHANGED,
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle());
}
void
@ -245,7 +245,7 @@ SessionAccessibility::SendTextSelectionChangedEvent(AccessibleWrap* aAccessible,
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_VIEW_TEXT_SELECTION_CHANGED,
aAccessible->VirtualViewID(), eventInfo, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), eventInfo, aAccessible->ToBundle());
}
void
@ -279,7 +279,7 @@ SessionAccessibility::SendTextChangedEvent(AccessibleWrap* aAccessible,
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_VIEW_TEXT_CHANGED,
aAccessible->VirtualViewID(), eventInfo, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), eventInfo, aAccessible->ToBundle());
}
void
@ -299,7 +299,7 @@ SessionAccessibility::SendTextTraversedEvent(AccessibleWrap* aAccessible,
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::
TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY,
aAccessible->VirtualViewID(), eventInfo, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), eventInfo, aAccessible->ToBundle());
}
void
@ -307,7 +307,7 @@ SessionAccessibility::SendClickedEvent(AccessibleWrap* aAccessible)
{
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_VIEW_CLICKED,
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle());
}
void
@ -315,5 +315,5 @@ SessionAccessibility::SendSelectedEvent(AccessibleWrap* aAccessible)
{
mSessionAccessibility->SendEvent(
java::sdk::AccessibilityEvent::TYPE_VIEW_SELECTED,
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle(true));
aAccessible->VirtualViewID(), nullptr, aAccessible->ToBundle());
}