Commit 3d29fcfe authored by Carsten Schoenert's avatar Carsten Schoenert
Browse files

New upstream version 91.0~b1

parent 3c76a94c
......@@ -2,11 +2,6 @@
# It was generated by `mach vendor rust`.
# Please do not edit.
[source."https://github.com/zakarumych/gpu-alloc.git"]
git = "https://github.com/zakarumych/gpu-alloc.git"
replace-with = "vendored-sources"
rev = "2cd1ad650cdd24d1647b6041f77ced0cbf1ff2a6"
[source."https://github.com/shravanrn/nix/"]
git = "https://github.com/shravanrn/nix/"
replace-with = "vendored-sources"
......@@ -15,17 +10,17 @@ rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
[source."https://github.com/msirringhaus/minidump_writer_linux.git"]
git = "https://github.com/msirringhaus/minidump_writer_linux.git"
replace-with = "vendored-sources"
rev = "5cea1c9a3d8ed3ed2d7bdd5be3285e7821400b7f"
rev = "85551909b95a5cf553a85dbcddfa5f117cfbbe0e"
[source."https://github.com/mozilla/neqo"]
git = "https://github.com/mozilla/neqo"
replace-with = "vendored-sources"
tag = "v0.4.25"
tag = "v0.4.27"
[source."https://github.com/mozilla/mp4parse-rust"]
git = "https://github.com/mozilla/mp4parse-rust"
replace-with = "vendored-sources"
rev = "dd967732ac836cc1ed5f1a7259d912c5d13e009b"
rev = "1bb484e96ae724309e3346968e8ffd4c25e61616"
[source."https://github.com/mozilla/cubeb-pulse-rs"]
git = "https://github.com/mozilla/cubeb-pulse-rs"
......@@ -50,7 +45,7 @@ rev = "8a576fbe79199fa8664f64285524017f74ebcc5f"
[source."https://github.com/mozilla-spidermonkey/jsparagus"]
git = "https://github.com/mozilla-spidermonkey/jsparagus"
replace-with = "vendored-sources"
rev = "d5d8c00ebd3281d12e0be5dfddbb69f791f836f1"
rev = "a45ca99e5be2062780032152a6daf94f29a307d3"
[source."https://github.com/kvark/spirv_cross"]
branch = "wgpu5"
......@@ -72,11 +67,6 @@ git = "https://github.com/jfkthame/mapped_hyph.git"
replace-with = "vendored-sources"
rev = "746743227485a83123784df0c53227ab466612ed"
[source."https://github.com/hsivonen/xmldecl"]
git = "https://github.com/hsivonen/xmldecl"
replace-with = "vendored-sources"
rev = "a74f7df5bf6cb11194fb74daa0c3cf42f326fd90"
[source."https://github.com/hsivonen/packed_simd"]
git = "https://github.com/hsivonen/packed_simd"
replace-with = "vendored-sources"
......@@ -90,27 +80,17 @@ rev = "ed8a4c6f900a90d4dbc1d64b856e61490a1c3570"
[source."https://github.com/hsivonen/chardetng"]
git = "https://github.com/hsivonen/chardetng"
replace-with = "vendored-sources"
rev = "39f95e2f7cd6e632a379cdeee62c68e8cedd7810"
rev = "302c995f91f44cf26e77dc4758ad56c3ff0153ad"
[source."https://github.com/gfx-rs/naga"]
git = "https://github.com/gfx-rs/naga"
replace-with = "vendored-sources"
tag = "gfx-22"
[source."https://github.com/gfx-rs/metal-rs"]
git = "https://github.com/gfx-rs/metal-rs"
replace-with = "vendored-sources"
rev = "78f632d194c7c16d18b71d7373c4080847d110b0"
tag = "gfx-25"
[source."https://github.com/gfx-rs/gfx"]
git = "https://github.com/gfx-rs/gfx"
replace-with = "vendored-sources"
rev = "84e02f96149207b1bafecb1924b14315930c98ee"
[source."https://github.com/gfx-rs/d3d12-rs"]
git = "https://github.com/gfx-rs/d3d12-rs"
replace-with = "vendored-sources"
rev = "be19a243b86e0bafb9937d661fc8eabb3e42b44e"
rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521"
[source."https://github.com/bytecodealliance/wasmtime"]
git = "https://github.com/bytecodealliance/wasmtime"
......@@ -120,12 +100,12 @@ rev = "824fa69756523f2b6d49029fe25de94130b1f144"
[source."https://github.com/PLSysSec/rlbox_lucet_sandbox/"]
git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/"
replace-with = "vendored-sources"
rev = "f3cace4fb8b53db0849c62af4fa62bade5a620f7"
rev = "5c8e79048d3ff6f434109e19d4aee4ff8624d3d7"
[source."https://github.com/PLSysSec/lucet_sandbox_compiler"]
git = "https://github.com/PLSysSec/lucet_sandbox_compiler"
replace-with = "vendored-sources"
rev = "cd07861d1c92147b35b538e6f94fde7d1986f9ad"
rev = "d582d76bf0d17984501f3933688bf7a1eb5cf208"
[source.crates-io]
replace-with = "vendored-sources"
......
......@@ -198,6 +198,8 @@ toolkit/crashreporter/breakpad-client/.*
toolkit/crashreporter/google-breakpad/.*
tools/fuzzing/libfuzzer/.*
tools/profiler/core/vtune/.*
# tools/profiler/public/GeckoTraceEvent.h is a modified vendored copy
tools/profiler/public/GeckoTraceEvent.h
xpcom/build/mach_override.c
xpcom/build/mach_override.h
xpcom/io/crc32c.c
......@@ -151,14 +151,14 @@ jobs:
when:
- {hour: 10, minute: 0}
- name: linux64-bp-clang-trunk
- name: linux64-clang-trunk-perf
job:
type: decision-task
treeherder-symbol: linux64-bp-clang-trunk
target-tasks-method: linux64_bp_clang_trunk
treeherder-symbol: linux64-clang-trunk-perf
target-tasks-method: linux64_clang_trunk_perf
run-on-projects:
- mozilla-beta
- mozilla-central
- mozilla-release
when:
- {hour: 2, minute: 0}
......@@ -256,6 +256,17 @@ jobs:
- {weekday: 'Saturday', hour: 3, minute: 0}
- {weekday: 'Sunday', hour: 3, minute: 0}
- name: perftest-s7
job:
type: decision-task
treeherder-symbol: tp6m
target-tasks-method: perftest_s7
include-push-tasks: true
run-on-projects:
- mozilla-central
when:
- {weekday: 'Saturday', hour: 3, minute: 0}
- name: condprof
job:
type: decision-task
......@@ -315,3 +326,15 @@ jobs:
action-name: scriptworker-canary
include-cron-input: true
when: [] # never (hook only)
- name: l10n-cross-channel
job:
type: decision-task
treeherder-symbol: l10n-cross-channel
target-tasks-method: l10n-cross-channel
run-on-projects:
- mozilla-central
when:
by-project:
mozilla-central: [{hour: 8, minute: 0}, {hour: 20, minute: 0}]
default: []
......@@ -155,6 +155,7 @@ python/
# These are (mainly) imported code that we don't want to lint to make imports easier.
remote/cdp/Protocol.jsm
remote/cdp/test/browser/chrome-remote-interface.js
remote/marionette/atom.js
# services/ exclusions
......@@ -170,7 +171,6 @@ servo/
# Test files that we don't want to lint (preprocessed, minified etc)
testing/condprofile/condprof/tests/profile
testing/marionette/atom.js
testing/mozbase/mozprofile/tests/files/prefs_with_comments.js
testing/talos/talos/scripts/jszip.min.js
testing/talos/talos/startup_test/sessionrestore/profile/sessionstore.js
......@@ -207,9 +207,6 @@ toolkit/components/reader/Readerable.jsm
toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js
toolkit/modules/AppConstants.jsm
# Tests old non-star function generators
toolkit/modules/tests/xpcshell/test_task.js
# Uses special template formatting.
tools/tryselect/selectors/chooser/templates/chooser.html
......
......@@ -503,21 +503,16 @@ module.exports = {
"browser/components/enterprisepolicies/tests/xpcshell/test_proxy.js",
"browser/components/enterprisepolicies/tests/xpcshell/test_runOnce_helper.js",
"browser/components/extensions/test/browser/browser_ext_browserAction_context.js",
"browser/components/extensions/test/browser/browser_ext_browserAction_popup.js",
"browser/components/extensions/test/browser/browser_ext_browserAction_popup_preload.js",
"browser/components/extensions/test/browser/browser_ext_currentWindow.js",
"browser/components/extensions/test/browser/browser_ext_getViews.js",
"browser/components/extensions/test/browser/browser_ext_management.js",
"browser/components/extensions/test/browser/browser_ext_menus_events.js",
"browser/components/extensions/test/browser/browser_ext_openPanel.js",
"browser/components/extensions/test/browser/browser_ext_pageAction_context.js",
"browser/components/extensions/test/browser/browser_ext_pageAction_popup.js",
"browser/components/extensions/test/browser/browser_ext_pageAction_show_matches.js",
"browser/components/extensions/test/browser/browser_ext_sessions_getRecentlyClosed_private.js",
"browser/components/extensions/test/browser/browser_ext_sessions_restore.js",
"browser/components/extensions/test/browser/browser_ext_tabs_audio.js",
"browser/components/extensions/test/browser/browser_ext_tabs_duplicate.js",
"browser/components/extensions/test/browser/browser_ext_tabs_newtab_private.js",
"browser/components/extensions/test/browser/browser_ext_tabs_removeCSS.js",
"browser/components/extensions/test/browser/browser_ext_tabs_zoom.js",
"browser/components/extensions/test/browser/browser_ext_windows.js",
......@@ -577,15 +572,6 @@ module.exports = {
"toolkit/components/passwordmgr/test/unit/test_getPasswordFields.js",
"toolkit/components/passwordmgr/test/unit/test_getUserNameAndPasswordFields.js",
"toolkit/components/processsingleton/MainProcessSingleton.jsm",
"toolkit/components/telemetry/tests/unit/head.js",
"toolkit/components/telemetry/tests/unit/test_EventPing.js",
"toolkit/components/telemetry/tests/unit/test_HealthPing.js",
"toolkit/components/telemetry/tests/unit/test_PingAPI.js",
"toolkit/components/telemetry/tests/unit/test_PrioPing.js",
"toolkit/components/telemetry/tests/unit/test_TelemetryController_idle.js",
"toolkit/components/telemetry/tests/unit/test_TelemetryReportingPolicy.js",
"toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js",
"toolkit/components/telemetry/tests/unit/test_TelemetrySession.js",
"toolkit/modules/subprocess/test/xpcshell/test_subprocess.js",
"toolkit/modules/tests/xpcshell/test_GMPInstallManager.js",
"toolkit/mozapps/extensions/internal/AddonTestUtils.jsm",
......
......@@ -72,7 +72,6 @@ exclude =
testing/marionette/harness/marionette_harness/tests,
testing/mochitest/pywebsocket3,
testing/mozharness/configs/test/test_malformed.py,
testing/web-platform/mozilla/tests/tools/wptserve_py2,
testing/web-platform/tests,
tools/lint/test/files,
tools/infer/test/*.configure,
......
[fix]
black:pattern = set:python/**.py - **/third_party/** and tracked()
This diff is collapsed.
......@@ -75,15 +75,15 @@ opt-level = 2
opt-level = 2
[patch.crates-io]
chardetng = { git = "https://github.com/hsivonen/chardetng", rev="39f95e2f7cd6e632a379cdeee62c68e8cedd7810" }
chardetng = { git = "https://github.com/hsivonen/chardetng", rev="302c995f91f44cf26e77dc4758ad56c3ff0153ad" }
chardetng_c = { git = "https://github.com/hsivonen/chardetng_c", rev="ed8a4c6f900a90d4dbc1d64b856e61490a1c3570" }
libudev-sys = { path = "dom/webauthn/libudev-sys" }
packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="0917fe780032a6bbb23d71be545f9c1834128d75" }
rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="f3cace4fb8b53db0849c62af4fa62bade5a620f7" }
rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="5c8e79048d3ff6f434109e19d4aee4ff8624d3d7" }
nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu5" }
minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "5cea1c9a3d8ed3ed2d7bdd5be3285e7821400b7f" }
xmldecl = { git = "https://github.com/hsivonen/xmldecl", rev="a74f7df5bf6cb11194fb74daa0c3cf42f326fd90" }
minidump_writer_linux = { git = "https://github.com/msirringhaus/minidump_writer_linux.git", rev = "85551909b95a5cf553a85dbcddfa5f117cfbbe0e" }
[patch.crates-io.cranelift-codegen]
git = "https://github.com/bytecodealliance/wasmtime"
......@@ -97,9 +97,6 @@ rev = "824fa69756523f2b6d49029fe25de94130b1f144"
[patch.crates-io.autocfg]
path = "third_party/rust/autocfg"
[patch.crates-io.autocfg01]
path = "third_party/rust/autocfg-0.1.6"
package = "autocfg"
# Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2.
# There is not going to be new version of mio 0.6, mio now being >= 0.7.11.
......@@ -108,4 +105,4 @@ path = "third_party/rust/mio"
# Patch failure 0.1.8 to disable the backtrace feature by default. See bug 1608157.
[patch.crates-io.failure]
path = "third_party/rust/failure"
path = "third_party/rust/failure"
\ No newline at end of file
......@@ -8,6 +8,7 @@
#include "JavaBuiltins.h"
#include "LocalAccessible-inl.h"
#include "HyperTextAccessible-inl.h"
#include "AccAttributes.h"
#include "AccEvent.h"
#include "AndroidInputType.h"
#include "DocAccessibleWrap.h"
......@@ -19,7 +20,6 @@
#include "Platform.h"
#include "nsAccessibilityService.h"
#include "nsEventShell.h"
#include "nsPersistentProperties.h"
#include "nsIAccessibleAnnouncementEvent.h"
#include "nsAccUtils.h"
#include "nsTextEquivUtils.h"
......@@ -534,16 +534,14 @@ uint32_t AccessibleWrap::GetFlags(role aRole, uint64_t aState,
return flags;
}
void AccessibleWrap::GetRoleDescription(role aRole,
nsIPersistentProperties* aAttributes,
void AccessibleWrap::GetRoleDescription(role aRole, AccAttributes* aAttributes,
nsAString& aGeckoRole,
nsAString& aRoleDescription) {
if (aRole == roles::HEADING && aAttributes) {
// The heading level is an attribute, so we need that.
AutoTArray<nsString, 1> formatString;
nsresult rv = aAttributes->GetStringProperty("level"_ns,
*formatString.AppendElement());
if (NS_SUCCEEDED(rv) &&
if (aAttributes->GetAttribute(nsGkAtoms::level,
*formatString.AppendElement()) &&
LocalizeString("headingLevel", aRoleDescription, formatString)) {
return;
}
......@@ -551,8 +549,7 @@ void AccessibleWrap::GetRoleDescription(role aRole,
if ((aRole == roles::LANDMARK || aRole == roles::REGION) && aAttributes) {
nsAutoString xmlRoles;
if (NS_SUCCEEDED(
aAttributes->GetStringProperty("xml-roles"_ns, xmlRoles))) {
if (aAttributes->GetAttribute(nsGkAtoms::xmlroles, xmlRoles)) {
nsWhitespaceTokenizer tokenizer(xmlRoles);
while (tokenizer.hasMoreTokens()) {
if (LocalizeString(NS_ConvertUTF16toUTF8(tokenizer.nextToken()).get(),
......@@ -567,20 +564,6 @@ void AccessibleWrap::GetRoleDescription(role aRole,
LocalizeString(NS_ConvertUTF16toUTF8(aGeckoRole).get(), aRoleDescription);
}
already_AddRefed<nsIPersistentProperties>
AccessibleWrap::AttributeArrayToProperties(
const nsTArray<Attribute>& aAttributes) {
RefPtr<nsPersistentProperties> props = new nsPersistentProperties();
nsAutoString unused;
for (size_t i = 0; i < aAttributes.Length(); i++) {
props->SetStringProperty(aAttributes.ElementAt(i).Name(),
aAttributes.ElementAt(i).Value(), unused);
}
return props.forget();
}
int32_t AccessibleWrap::GetAndroidClass(role aRole) {
#define ROLE(geckoRole, stringRole, atkRole, macRole, macSubrole, msaaRole, \
ia2Role, androidClass, nameRule) \
......@@ -671,7 +654,7 @@ mozilla::java::GeckoBundle::LocalRef AccessibleWrap::ToBundle(bool aSmall) {
double step = UnspecifiedNaN<double>();
WrapperRangeInfo(&curValue, &minValue, &maxValue, &step);
nsCOMPtr<nsIPersistentProperties> attributes = Attributes();
RefPtr<AccAttributes> attributes = Attributes();
return ToBundle(State(), Bounds(), ActionCount(), name, textValue, nodeID,
description, curValue, minValue, maxValue, step, attributes);
......@@ -682,7 +665,7 @@ mozilla::java::GeckoBundle::LocalRef AccessibleWrap::ToBundle(
const nsString& aName, const nsString& aTextValue,
const nsString& aDOMNodeID, const nsString& aDescription,
const double& aCurVal, const double& aMinVal, const double& aMaxVal,
const double& aStep, nsIPersistentProperties* aAttributes) {
const double& aStep, AccAttributes* aAttributes) {
if (!IsProxy() && IsDefunct()) {
return nullptr;
}
......@@ -792,61 +775,52 @@ mozilla::java::GeckoBundle::LocalRef AccessibleWrap::ToBundle(
if (aAttributes) {
nsString inputTypeAttr;
nsAccUtils::GetAccAttr(aAttributes, nsGkAtoms::textInputType,
inputTypeAttr);
aAttributes->GetAttribute(nsGkAtoms::textInputType, inputTypeAttr);
int32_t inputType = GetInputType(inputTypeAttr);
if (inputType) {
GECKOBUNDLE_PUT(nodeInfo, "inputType",
java::sdk::Integer::ValueOf(inputType));
}
nsString posinset;
nsresult rv = aAttributes->GetStringProperty("posinset"_ns, posinset);
if (NS_SUCCEEDED(rv)) {
int32_t rowIndex;
if (sscanf(NS_ConvertUTF16toUTF8(posinset).get(), "%d", &rowIndex) > 0) {
GECKOBUNDLE_START(collectionItemInfo);
GECKOBUNDLE_PUT(collectionItemInfo, "rowIndex",
java::sdk::Integer::ValueOf(rowIndex));
GECKOBUNDLE_PUT(collectionItemInfo, "columnIndex",
java::sdk::Integer::ValueOf(0));
GECKOBUNDLE_PUT(collectionItemInfo, "rowSpan",
java::sdk::Integer::ValueOf(1));
GECKOBUNDLE_PUT(collectionItemInfo, "columnSpan",
java::sdk::Integer::ValueOf(1));
GECKOBUNDLE_FINISH(collectionItemInfo);
GECKOBUNDLE_PUT(nodeInfo, "collectionItemInfo", collectionItemInfo);
}
Maybe<int32_t> rowIndex =
aAttributes->GetAttribute<int32_t>(nsGkAtoms::posinset);
if (rowIndex) {
GECKOBUNDLE_START(collectionItemInfo);
GECKOBUNDLE_PUT(collectionItemInfo, "rowIndex",
java::sdk::Integer::ValueOf(*rowIndex));
GECKOBUNDLE_PUT(collectionItemInfo, "columnIndex",
java::sdk::Integer::ValueOf(0));
GECKOBUNDLE_PUT(collectionItemInfo, "rowSpan",
java::sdk::Integer::ValueOf(1));
GECKOBUNDLE_PUT(collectionItemInfo, "columnSpan",
java::sdk::Integer::ValueOf(1));
GECKOBUNDLE_FINISH(collectionItemInfo);
GECKOBUNDLE_PUT(nodeInfo, "collectionItemInfo", collectionItemInfo);
}
nsString colSize;
rv = aAttributes->GetStringProperty("child-item-count"_ns, colSize);
if (NS_SUCCEEDED(rv)) {
int32_t rowCount;
if (sscanf(NS_ConvertUTF16toUTF8(colSize).get(), "%d", &rowCount) > 0) {
GECKOBUNDLE_START(collectionInfo);
GECKOBUNDLE_PUT(collectionInfo, "rowCount",
java::sdk::Integer::ValueOf(rowCount));
GECKOBUNDLE_PUT(collectionInfo, "columnCount",
java::sdk::Integer::ValueOf(1));
nsString unused;
rv = aAttributes->GetStringProperty("hierarchical"_ns, unused);
if (NS_SUCCEEDED(rv)) {
GECKOBUNDLE_PUT(collectionInfo, "isHierarchical",
java::sdk::Boolean::TRUE());
}
if (IsSelect()) {
int32_t selectionMode = (aState & states::MULTISELECTABLE) ? 2 : 1;
GECKOBUNDLE_PUT(collectionInfo, "selectionMode",
java::sdk::Integer::ValueOf(selectionMode));
}
Maybe<int32_t> rowCount =
aAttributes->GetAttribute<int32_t>(nsGkAtoms::child_item_count);
if (rowCount) {
GECKOBUNDLE_START(collectionInfo);
GECKOBUNDLE_PUT(collectionInfo, "rowCount",
java::sdk::Integer::ValueOf(*rowCount));
GECKOBUNDLE_PUT(collectionInfo, "columnCount",
java::sdk::Integer::ValueOf(1));
if (aAttributes->HasAttribute(nsGkAtoms::tree)) {
GECKOBUNDLE_PUT(collectionInfo, "isHierarchical",
java::sdk::Boolean::TRUE());
}
GECKOBUNDLE_FINISH(collectionInfo);
GECKOBUNDLE_PUT(nodeInfo, "collectionInfo", collectionInfo);
if (IsSelect()) {
int32_t selectionMode = (aState & states::MULTISELECTABLE) ? 2 : 1;
GECKOBUNDLE_PUT(collectionInfo, "selectionMode",
java::sdk::Integer::ValueOf(selectionMode));
}
GECKOBUNDLE_FINISH(collectionInfo);
GECKOBUNDLE_PUT(nodeInfo, "collectionInfo", collectionInfo);
}
}
......@@ -895,10 +869,9 @@ bool AccessibleWrap::HandleLiveRegionEvent(AccEvent* aEvent) {
return false;
}
nsCOMPtr<nsIPersistentProperties> attributes = Attributes();
RefPtr<AccAttributes> attributes = Attributes();
nsString live;
nsresult rv = attributes->GetStringProperty("container-live"_ns, live);
if (!NS_SUCCEEDED(rv)) {
if (!attributes->GetAttribute(nsGkAtoms::containerLive, live)) {
return false;
}
......@@ -906,12 +879,11 @@ bool AccessibleWrap::HandleLiveRegionEvent(AccEvent* aEvent) {
? nsIAccessibleAnnouncementEvent::ASSERTIVE
: nsIAccessibleAnnouncementEvent::POLITE;
nsString atomic;
rv = attributes->GetStringProperty("container-atomic"_ns, atomic);
Maybe<bool> atomic =
attributes->GetAttribute<bool>(nsGkAtoms::containerAtomic);
LocalAccessible* announcementTarget = this;
nsAutoString announcement;
if (atomic.EqualsIgnoreCase("true")) {
if (atomic && *atomic) {
LocalAccessible* atomicAncestor = nullptr;
for (LocalAccessible* parent = announcementTarget; parent;
parent = parent->LocalParent()) {
......
......@@ -63,7 +63,7 @@ class AccessibleWrap : public LocalAccessible {
const double& aMinVal = UnspecifiedNaN<double>(),
const double& aMaxVal = UnspecifiedNaN<double>(),
const double& aStep = UnspecifiedNaN<double>(),
nsIPersistentProperties* aAttributes = nullptr);
AccAttributes* aAttributes = nullptr);
virtual void WrapperDOMNodeID(nsString& aDOMNodeID);
......@@ -72,9 +72,6 @@ class AccessibleWrap : public LocalAccessible {
: GetAndroidClass(WrapperRole());
}
static already_AddRefed<nsIPersistentProperties> AttributeArrayToProperties(
const nsTArray<Attribute>& aAttributes);
static const int32_t kNoID = -1;
protected:
......@@ -104,8 +101,7 @@ class AccessibleWrap : public LocalAccessible {
void GetSelectionOrCaret(int32_t* aStartOffset, int32_t* aEndOffset);
static void GetRoleDescription(role aRole,
nsIPersistentProperties* aAttributes,
static void GetRoleDescription(role aRole, AccAttributes* aAttributes,
nsAString& aGeckoRole,
nsAString& aRoleDescription);
......
......@@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "LocalAccessible-inl.h"
#include "AccAttributes.h"
#include "AccessibleOrProxy.h"
#include "DocAccessibleChild.h"
#include "DocAccessibleWrap.h"
......@@ -13,7 +14,6 @@
#include "nsLayoutUtils.h"
#include "nsAccessibilityService.h"
#include "nsAccUtils.h"
#include "nsIPersistentProperties2.h"
#include "Pivot.h"
#include "SessionAccessibility.h"
#include "TraversalRule.h"
......@@ -151,7 +151,7 @@ void DocAccessibleWrap::CacheViewportCallback(nsITimer* aTimer,
accessible->State(), accessible->Bounds(), accessible->ActionCount(),
name, textValue, nodeID, description, UnspecifiedNaN<double>(),
UnspecifiedNaN<double>(), UnspecifiedNaN<double>(),
UnspecifiedNaN<double>(), nsTArray<Attribute>()));
UnspecifiedNaN<double>(), nullptr));
}
ipcDoc->SendBatch(eBatch_Viewport, cacheData);
......@@ -239,9 +239,7 @@ void DocAccessibleWrap::CacheFocusPath(AccessibleWrap* aAccessible) {
acc->WrapperDOMNodeID(nodeID);
nsAutoString description;
acc->Description(description);
nsCOMPtr<nsIPersistentProperties> props = acc->Attributes();
nsTArray<Attribute> attributes;
nsAccUtils::PersistentPropertiesToArray(props, &attributes);
RefPtr<AccAttributes> attributes = acc->Attributes();
cacheData.AppendElement(
BatchData(acc->Document()->IPCDoc(), UNIQUE_ID(acc), acc->State(),
acc->Bounds(), acc->ActionCount(), name, textValue, nodeID,
......@@ -279,12 +277,11 @@ void DocAccessibleWrap::UpdateFocusPathBounds() {
continue;
}
boundsData.AppendElement(
BatchData(accessible->Document()->IPCDoc(), UNIQUE_ID(accessible), 0,
accessible->Bounds(), 0, nsString(), nsString(), nsString(),
nsString(), UnspecifiedNaN<double>(),
UnspecifiedNaN<double>(), UnspecifiedNaN<double>(),
UnspecifiedNaN<double>(), nsTArray<Attribute>()));
boundsData.AppendElement(BatchData(
accessible->Document()->IPCDoc(), UNIQUE_ID(accessible), 0,
accessible->Bounds(), 0, nsString(), nsString(), nsString(),
nsString(), UnspecifiedNaN<double>(), UnspecifiedNaN<double>(),
UnspecifiedNaN<double>(), UnspecifiedNaN<double>(), nullptr));
}
ipcDoc->SendBatch(eBatch_BoundsUpdate, boundsData);
......
......@@ -6,8 +6,6 @@
#include "RemoteAccessibleWrap.h"
#include "LocalAccessible-inl.h"
#include "nsPersistentProperties.h"
#include "mozilla/a11y/DocAccessiblePlatformExtParent.h"
using namespace mozilla::a11y;
......@@ -52,10 +50,10 @@ void RemoteAccessibleWrap::Shutdown() {
// LocalAccessible
already_AddRefed<nsIPersistentProperties> RemoteAccessibleWrap::Attributes() {
AutoTArray<Attribute, 10> attrs;
already_AddRefed<AccAttributes> RemoteAccessibleWrap::Attributes() {
RefPtr<AccAttributes> attrs;
Proxy()->Attributes(&attrs);
return AttributeArrayToProperties(attrs);
return attrs.forget();
}
uint32_t RemoteAccessibleWrap::ChildCount() const {
......
......@@ -29,7 +29,7 @@ class RemoteAccessibleWrap : public AccessibleWrap {
// LocalAccessible
virtual already_AddRefed<nsIPersistentProperties> Attributes() override;
virtual already_AddRefed<AccAttributes> Attributes() override;
virtual uint32_t ChildCount() const override;
......
......@@ -8,13 +8,13 @@
#include "AndroidUiThread.h"
#include "DocAccessibleParent.h"
#include "nsThreadUtils.h"
#include "AccAttributes.h"
#include "AccessibilityEvent.h"
#include "HyperTextAccessible.h"
#include "JavaBuiltins.h"
#include "RootAccessibleWrap.h"
#include "nsAccessibilityService.h"
#include "nsViewManager.h"
#include "nsIPersistentProperties2.h"
#include "mozilla/PresShell.h"
#include "mozilla/dom/BrowserParent.h"
......@@ -416,13 +416,11 @@ void SessionAccessibility::ReplaceFocusPathCache(
if (aData.Length() == aAccessibles.Length()) {
const BatchData& data = aData.ElementAt(i);
nsCOMPtr<nsIPersistentProperties> props =
AccessibleWrap::AttributeArrayToProperties(data.Attributes());
auto bundle =
acc->ToBundle(data.State(), data.Bounds(), data.ActionCount(),