
* chore: bump chromium to 135.0.7049.7 (main) (#45900) chore: bump chromium in DEPS to 135.0.7049.7 (cherry picked from commitbb1c3dff21
) * chore: bump chromium to 136.0.7053.1 (main) (#45906) * chore: bump chromium in DEPS to 136.0.7052.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch6318359
patch applied manually due to context shear * chore: update preconnect_manager.patch Xref:6318420
patch applied manually due to context shear * chore: e patches all * chore: bump chromium to 136.0.7053.1 * chore: update fix_remove_profiles_from_spellcheck_service.patch Xref:6326575
patch applied manually due to context shear * chore: e patches all * chore: revert removal of v8 API used by Node.js * devtools: Remove DevToolsUIBindings::SendJsonRequest() |6326236
* 6244461: Merge //content/common/user_agent.cc into //components/embedder_support:user_agent |6244461
* 6313744: Migrate views::Background factory methods to ColorVariant |6313744
* 6314545: Remove multiple argument support from base::ToString() |6314545
* 6317362: [Extensions] Inline MessagingDelegate::CreateReceiverForTab() |6317362
* 6308998: Add SettingAccess structured metrics event for DevTools |6308998
* 6295214: Remove redundant state field in per-extension preferences |6295214
NB: this change is copied from the upstream change to extensions/shell/browser/shell_extension_loader.cc * fix: ui/ linter error This is showing up in an eslint build step in Electron: > /__w/electron/electron/src/out/Default/gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts > 77:23 error This assertion is unnecessary since the receiver accepts the original type of the expression @typescript-eslint/no-unnecessary-type-assertion > > ✖ 1 problem (1 error, 0 warnings) > 1 error and 0 warnings potentially fixable with the `--fix` option. However, removing the assertion causes a typescript build failure: > gen/ui/webui/resources/cr_elements/preprocessed/cr_menu_selector/cr_menu_selector.ts:77:23 - error TS2345: Argument of type 'HTMLElement | null' is not assignable to parameter of type 'HTMLElement'. > Type 'null' is not assignable to type 'HTMLElement'. > > 77 items.indexOf(this.querySelector<HTMLElement>(':focus')); > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ So I think the two different steps may be picking up typescript definitions. This patch should be removed after the issue is tracked down and fixed in a followup task. * fix: -Wnonnull warning Fixes this warning: > 2025-03-07T01:05:01.8637705Z ../../third_party/electron_node/src/debug_utils.cc(257,12): error: null passed to a callee that requires a non-null argument [-Werror,-Wnonnull] > 2025-03-07T01:05:01.8638267Z 257 | return nullptr; > 2025-03-07T01:05:01.8638481Z | ^~~~~~~ > 2025-03-07T01:05:01.8638700Z 1 error generated. Not sure why this warning was never triggered before; `git blame` indicates this code hasn't changed in ages: > c40a8273ef2 (Michaël Zasso 2024-05-10 09:50:20 +0200 255) #endif // DEBUG > 8e2d33f1562 (Anna Henningsen 2018-06-07 16:54:29 +0200 256) } > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 257) return nullptr; > 247b5130595 (Refael Ackermann 2018-10-22 15:07:00 -0400 258) } Presumably this is failing in this Chromium roll due to a clang version bump. We should remove this patch after upstreaming it. * docs: add upstream pr link for Node patch --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commit458b14b8ed
) * chore!: bump chromium to 136.0.7054.0 (main) (#45923) * chore: bump chromium in DEPS to 136.0.7054.0 * chore: update allow_in-process_windows_to_have_different_web_prefs.patch Xref:5906158
patch applied manually due to context shear * chore: e patches all * refactor!: Session.clearStorageData(syncable) Xref:6309405
Remove syncable type from opts.quota in Session.clearStorageData(opts) because it that category has been removed upstream. BREAKING CHANGE: Removed ses.clearDataStorage({ quota: 'syncable' }) * docs: deprecate Session.clearDataStorage({ quota }) --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commit20414f66ca
) * chore: bump chromium to 136.0.7058.1 (main) (#45928) * chore: bump chromium in DEPS to 136.0.7056.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch no manual changes; patch applied with fuzz * chore: update fix_adapt_exclusive_access_for_electron_needs.patch patch applied manually due to context shear 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble |6319958
* chore: update feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch no manual changes; patch applied with fuzz 6311876: Expose captured surface resolution for MacOS |6311876
* chore: e patches all * 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble |6319958
* 6326673: views: Delete the single-parameter Widget::InitParams constructor. |6326673
*6331102
* 6331102: [A11yPerformance] Rename AXMode::kScreenReader to kExtendedProperties |6331102
Sync with shell/browser/ui/webui/accessibility_ui.cc to upstream chrome/browser/accessibility/accessibility_ui.cc changes in 4af8657 * chore: bump Chromium 136.0.7058.1 (#45933) chore: bump chromium in DEPS to 136.0.7058.1 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> (cherry picked from commitb0c11371e0
) * chore: bump chromium to 136.0.7062.0 (main) (#45957) * chore: bump chromium in DEPS to 136.0.7059.0 * chore: bump chromium in DEPS to 136.0.7060.0 * chore: bump chromium in DEPS to 136.0.7062.0 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> (cherry picked from commit2de8fd7d93
) * fixup! chore: bump chromium to 136.0.7053.1 (main) (#45906) chore: fix patch shear * chore: remove cherry-pick-521faebc8a7c.patch fixed upstream @ 521faeb 6334632: Disable setting primtive restart for WebGL in the cmd decoder. |6334632
* chore: remove cherry-pick-9dacf5694dfd.patch fixed upstream @ 9dacf56 6330188: Move WebGL primitive restart state setting to the GPU process. |6330188
* chore: e patches all --------- Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
442 lines
17 KiB
C++
442 lines
17 KiB
C++
// Copyright (c) 2020 Microsoft, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/ui/webui/accessibility_ui.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <string_view>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/functional/bind.h"
|
|
#include "base/functional/callback_helpers.h"
|
|
#include "base/json/json_writer.h"
|
|
#include "base/strings/escape.h"
|
|
#include "base/strings/string_split.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "base/values.h"
|
|
#include "chrome/common/pref_names.h"
|
|
#include "chrome/common/webui_url_constants.h"
|
|
#include "chrome/grit/accessibility_resources.h" // nogncheck
|
|
#include "chrome/grit/accessibility_resources_map.h" // nogncheck
|
|
#include "components/pref_registry/pref_registry_syncable.h"
|
|
#include "components/prefs/pref_service.h"
|
|
#include "content/public/browser/ax_inspect_factory.h"
|
|
#include "content/public/browser/browser_accessibility_state.h"
|
|
#include "content/public/browser/browser_context.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "content/public/browser/favicon_status.h"
|
|
#include "content/public/browser/navigation_entry.h"
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "content/public/browser/render_view_host.h"
|
|
#include "content/public/browser/render_widget_host.h"
|
|
#include "content/public/browser/render_widget_host_iterator.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "content/public/browser/web_contents_delegate.h"
|
|
#include "content/public/browser/web_ui_data_source.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/window_list.h"
|
|
#include "ui/accessibility/accessibility_features.h"
|
|
#include "ui/accessibility/ax_updates_and_events.h"
|
|
#include "ui/accessibility/platform/ax_platform_node.h"
|
|
#include "ui/accessibility/platform/ax_platform_node_delegate.h"
|
|
#include "ui/base/webui/web_ui_util.h"
|
|
#include "ui/views/accessibility/view_accessibility.h"
|
|
#include "ui/views/accessibility/widget_ax_tree_id_map.h"
|
|
#include "ui/views/widget/widget.h"
|
|
#include "ui/views/widget/widget_delegate.h"
|
|
|
|
namespace {
|
|
|
|
constexpr std::string_view kTargetsDataFile = "targets-data.json";
|
|
|
|
constexpr std::string_view kAccessibilityModeField = "a11yMode";
|
|
constexpr std::string_view kBrowsersField = "browsers";
|
|
constexpr std::string_view kErrorField = "error";
|
|
constexpr std::string_view kFaviconUrlField = "faviconUrl";
|
|
constexpr std::string_view kNameField = "name";
|
|
constexpr std::string_view kPagesField = "pages";
|
|
constexpr std::string_view kPidField = "pid";
|
|
constexpr std::string_view kProcessIdField = "processId";
|
|
constexpr std::string_view kRequestTypeField = "requestType";
|
|
constexpr std::string_view kRoutingIdField = "routingId";
|
|
constexpr std::string_view kSessionIdField = "sessionId";
|
|
constexpr std::string_view kSupportedApiTypesField = "supportedApiTypes";
|
|
constexpr std::string_view kTreeField = "tree";
|
|
constexpr std::string_view kTypeField = "type";
|
|
constexpr std::string_view kUrlField = "url";
|
|
constexpr std::string_view kApiTypeField = "apiType";
|
|
|
|
// Global flags
|
|
constexpr std::string_view kBrowser = "browser";
|
|
constexpr std::string_view kCopyTree = "copyTree";
|
|
constexpr std::string_view kHTML = "html";
|
|
constexpr std::string_view kLocked = "locked";
|
|
constexpr std::string_view kNative = "native";
|
|
constexpr std::string_view kPage = "page";
|
|
constexpr std::string_view kPDFPrinting = "pdfPrinting";
|
|
constexpr std::string_view kExtendedProperties = "extendedProperties";
|
|
constexpr std::string_view kShowOrRefreshTree = "showOrRefreshTree";
|
|
constexpr std::string_view kText = "text";
|
|
constexpr std::string_view kWeb = "web";
|
|
|
|
// Possible global flag values
|
|
constexpr std::string_view kDisabled = "disabled";
|
|
constexpr std::string_view kOff = "off";
|
|
constexpr std::string_view kOn = "on";
|
|
|
|
base::Value::Dict BuildTargetDescriptor(
|
|
const GURL& url,
|
|
const std::string& name,
|
|
const GURL& favicon_url,
|
|
int process_id,
|
|
int routing_id,
|
|
ui::AXMode accessibility_mode,
|
|
base::ProcessHandle handle = base::kNullProcessHandle) {
|
|
base::Value::Dict target_data;
|
|
target_data.Set(kProcessIdField, process_id);
|
|
target_data.Set(kRoutingIdField, routing_id);
|
|
target_data.Set(kUrlField, url.spec());
|
|
target_data.Set(kNameField, base::EscapeForHTML(name));
|
|
target_data.Set(kPidField, static_cast<int>(base::GetProcId(handle)));
|
|
target_data.Set(kFaviconUrlField, favicon_url.spec());
|
|
target_data.Set(kAccessibilityModeField,
|
|
static_cast<int>(accessibility_mode.flags()));
|
|
target_data.Set(kTypeField, kPage);
|
|
return target_data;
|
|
}
|
|
|
|
base::Value::Dict BuildTargetDescriptor(content::RenderViewHost* rvh) {
|
|
content::WebContents* web_contents =
|
|
content::WebContents::FromRenderViewHost(rvh);
|
|
ui::AXMode accessibility_mode;
|
|
|
|
std::string title;
|
|
GURL url;
|
|
GURL favicon_url;
|
|
if (web_contents) {
|
|
url = web_contents->GetURL();
|
|
title = base::UTF16ToUTF8(web_contents->GetTitle());
|
|
content::NavigationController& controller = web_contents->GetController();
|
|
content::NavigationEntry* entry = controller.GetVisibleEntry();
|
|
if (entry != nullptr && entry->GetURL().is_valid()) {
|
|
gfx::Image favicon_image = entry->GetFavicon().image;
|
|
if (!favicon_image.IsEmpty()) {
|
|
const SkBitmap* favicon_bitmap = favicon_image.ToSkBitmap();
|
|
favicon_url = GURL(webui::GetBitmapDataUrl(*favicon_bitmap));
|
|
}
|
|
}
|
|
accessibility_mode = web_contents->GetAccessibilityMode();
|
|
}
|
|
|
|
return BuildTargetDescriptor(url, title, favicon_url,
|
|
rvh->GetProcess()->GetDeprecatedID(),
|
|
rvh->GetRoutingID(), accessibility_mode);
|
|
}
|
|
|
|
base::Value::Dict BuildTargetDescriptor(electron::NativeWindow* window) {
|
|
base::Value::Dict target_data;
|
|
target_data.Set(kSessionIdField, window->window_id());
|
|
target_data.Set(kNameField, window->GetTitle());
|
|
target_data.Set(kTypeField, kBrowser);
|
|
return target_data;
|
|
}
|
|
|
|
bool ShouldHandleAccessibilityRequestCallback(const std::string& path) {
|
|
return path == kTargetsDataFile;
|
|
}
|
|
|
|
void HandleAccessibilityRequestCallback(
|
|
content::BrowserContext* current_context,
|
|
const std::string& path,
|
|
content::WebUIDataSource::GotDataCallback callback) {
|
|
DCHECK(ShouldHandleAccessibilityRequestCallback(path));
|
|
|
|
base::Value::Dict data;
|
|
PrefService* pref =
|
|
static_cast<electron::ElectronBrowserContext*>(current_context)->prefs();
|
|
ui::AXMode mode =
|
|
content::BrowserAccessibilityState::GetInstance()->GetAccessibilityMode();
|
|
bool is_native_enabled = content::BrowserAccessibilityState::GetInstance()
|
|
->IsRendererAccessibilityEnabled();
|
|
bool native = mode.has_mode(ui::AXMode::kNativeAPIs);
|
|
bool web = mode.has_mode(ui::AXMode::kWebContents);
|
|
bool text = mode.has_mode(ui::AXMode::kInlineTextBoxes);
|
|
bool extendedProperties = mode.has_mode(ui::AXMode::kExtendedProperties);
|
|
bool html = mode.has_mode(ui::AXMode::kHTML);
|
|
bool pdf_printing = mode.has_mode(ui::AXMode::kPDFPrinting);
|
|
|
|
// The "native" and "web" flags are disabled if
|
|
// --disable-renderer-accessibility is set.
|
|
data.Set(kNative, is_native_enabled ? (native ? kOn : kOff) : kDisabled);
|
|
data.Set(kWeb, is_native_enabled ? (web ? kOn : kOff) : kDisabled);
|
|
|
|
// The "text", "extendedProperties" and "html" flags are only
|
|
// meaningful if "web" is enabled.
|
|
bool is_web_enabled = is_native_enabled && web;
|
|
data.Set(kText, is_web_enabled ? (text ? kOn : kOff) : kDisabled);
|
|
data.Set(kExtendedProperties,
|
|
is_web_enabled ? (extendedProperties ? kOn : kOff) : kDisabled);
|
|
data.Set(kHTML, is_web_enabled ? (html ? kOn : kOff) : kDisabled);
|
|
|
|
// The "pdfPrinting" flag is independent of the others.
|
|
data.Set(kPDFPrinting, pdf_printing ? kOn : kOff);
|
|
|
|
std::string pref_api_type =
|
|
std::string(pref->GetString(prefs::kShownAccessibilityApiType));
|
|
bool pref_api_type_supported = false;
|
|
|
|
std::vector<ui::AXApiType::Type> supported_api_types =
|
|
content::AXInspectFactory::SupportedApis();
|
|
base::Value::List supported_api_list;
|
|
supported_api_list.reserve(supported_api_types.size());
|
|
for (ui::AXApiType::Type type : supported_api_types) {
|
|
supported_api_list.Append(std::string_view(type));
|
|
if (type == ui::AXApiType::From(pref_api_type)) {
|
|
pref_api_type_supported = true;
|
|
}
|
|
}
|
|
data.Set(kSupportedApiTypesField, std::move(supported_api_list));
|
|
|
|
// If the saved API type is not supported, use the default platform formatter
|
|
// API type.
|
|
if (!pref_api_type_supported) {
|
|
pref_api_type = std::string_view(
|
|
content::AXInspectFactory::DefaultPlatformFormatterType());
|
|
}
|
|
data.Set(kApiTypeField, pref_api_type);
|
|
|
|
bool is_mode_locked = !content::BrowserAccessibilityState::GetInstance()
|
|
->IsAXModeChangeAllowed();
|
|
data.Set(kLocked, is_mode_locked ? kOn : kOff);
|
|
|
|
base::Value::List page_list;
|
|
std::unique_ptr<content::RenderWidgetHostIterator> widget_iter(
|
|
content::RenderWidgetHost::GetRenderWidgetHosts());
|
|
|
|
while (content::RenderWidgetHost* widget = widget_iter->GetNextHost()) {
|
|
// Ignore processes that don't have a connection, such as crashed tabs.
|
|
if (!widget->GetProcess()->IsInitializedAndNotDead()) {
|
|
continue;
|
|
}
|
|
content::RenderViewHost* rvh = content::RenderViewHost::From(widget);
|
|
if (!rvh) {
|
|
continue;
|
|
}
|
|
content::WebContents* web_contents =
|
|
content::WebContents::FromRenderViewHost(rvh);
|
|
content::WebContentsDelegate* delegate = web_contents->GetDelegate();
|
|
if (!delegate) {
|
|
continue;
|
|
}
|
|
if (web_contents->GetPrimaryMainFrame()->GetRenderViewHost() != rvh) {
|
|
continue;
|
|
}
|
|
// Ignore views that are never user-visible, like background pages.
|
|
if (delegate->IsNeverComposited(web_contents)) {
|
|
continue;
|
|
}
|
|
content::BrowserContext* context = rvh->GetProcess()->GetBrowserContext();
|
|
if (context != current_context) {
|
|
continue;
|
|
}
|
|
|
|
base::Value::Dict descriptor = BuildTargetDescriptor(rvh);
|
|
descriptor.Set(kNative, is_native_enabled);
|
|
descriptor.Set(kExtendedProperties, is_web_enabled && extendedProperties);
|
|
descriptor.Set(kWeb, is_web_enabled);
|
|
page_list.Append(std::move(descriptor));
|
|
}
|
|
data.Set(kPagesField, std::move(page_list));
|
|
|
|
base::Value::List window_list;
|
|
for (auto* window : electron::WindowList::GetWindows()) {
|
|
window_list.Append(BuildTargetDescriptor(window));
|
|
}
|
|
data.Set(kBrowsersField, std::move(window_list));
|
|
|
|
std::move(callback).Run(base::MakeRefCounted<base::RefCountedString>(
|
|
base::WriteJson(data).value_or("")));
|
|
}
|
|
|
|
std::string RecursiveDumpAXPlatformNodeAsString(
|
|
ui::AXPlatformNode* node,
|
|
int indent,
|
|
const std::vector<ui::AXPropertyFilter>& property_filters) {
|
|
if (!node) {
|
|
return "";
|
|
}
|
|
std::string str(2 * indent, '+');
|
|
std::string line = node->GetDelegate()->GetData().ToString();
|
|
std::vector<std::string> attributes = base::SplitString(
|
|
line, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
|
|
for (std::string attribute : attributes) {
|
|
if (ui::AXTreeFormatter::MatchesPropertyFilters(property_filters, attribute,
|
|
false)) {
|
|
str += attribute + " ";
|
|
}
|
|
}
|
|
str += "\n";
|
|
for (size_t i = 0; i < node->GetDelegate()->GetChildCount(); i++) {
|
|
gfx::NativeViewAccessible child = node->GetDelegate()->ChildAtIndex(i);
|
|
ui::AXPlatformNode* child_node =
|
|
ui::AXPlatformNode::FromNativeViewAccessible(child);
|
|
str += RecursiveDumpAXPlatformNodeAsString(child_node, indent + 1,
|
|
property_filters);
|
|
}
|
|
return str;
|
|
}
|
|
|
|
// Add property filters to the property_filters vector for the given property
|
|
// filter type. The attributes are passed in as a string with each attribute
|
|
// separated by a space.
|
|
void AddPropertyFilters(std::vector<ui::AXPropertyFilter>& property_filters,
|
|
const std::string& attributes,
|
|
ui::AXPropertyFilter::Type type) {
|
|
for (const std::string& attribute : base::SplitString(
|
|
attributes, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
|
|
property_filters.emplace_back(attribute, type);
|
|
}
|
|
}
|
|
|
|
bool IsValidJSValue(const std::string* str) {
|
|
return str && str->length() < 5000U;
|
|
}
|
|
|
|
const std::string& CheckJSValue(const std::string* str) {
|
|
CHECK(IsValidJSValue(str));
|
|
return *str;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
ElectronAccessibilityUI::ElectronAccessibilityUI(content::WebUI* web_ui)
|
|
: content::WebUIController(web_ui) {
|
|
auto* const browser_context = web_ui->GetWebContents()->GetBrowserContext();
|
|
// Set up the chrome://accessibility source.
|
|
content::WebUIDataSource* html_source =
|
|
content::WebUIDataSource::CreateAndAdd(
|
|
browser_context, chrome::kChromeUIAccessibilityHost);
|
|
|
|
// Add required resources.
|
|
html_source->UseStringsJs();
|
|
html_source->AddResourcePaths(kAccessibilityResources);
|
|
html_source->SetDefaultResource(IDR_ACCESSIBILITY_ACCESSIBILITY_HTML);
|
|
html_source->SetRequestFilter(
|
|
base::BindRepeating(&ShouldHandleAccessibilityRequestCallback),
|
|
base::BindRepeating(&HandleAccessibilityRequestCallback,
|
|
browser_context));
|
|
html_source->OverrideContentSecurityPolicy(
|
|
network::mojom::CSPDirectiveName::TrustedTypes,
|
|
"trusted-types parse-html-subset sanitize-inner-html;");
|
|
|
|
web_ui->AddMessageHandler(
|
|
std::make_unique<ElectronAccessibilityUIMessageHandler>());
|
|
}
|
|
|
|
ElectronAccessibilityUI::~ElectronAccessibilityUI() = default;
|
|
|
|
ElectronAccessibilityUIMessageHandler::ElectronAccessibilityUIMessageHandler() =
|
|
default;
|
|
|
|
void ElectronAccessibilityUIMessageHandler::GetRequestTypeAndFilters(
|
|
const base::Value::Dict& data,
|
|
std::string& request_type,
|
|
std::string& allow,
|
|
std::string& allow_empty,
|
|
std::string& deny) {
|
|
request_type = CheckJSValue(data.FindString(kRequestTypeField));
|
|
CHECK(request_type == kShowOrRefreshTree || request_type == kCopyTree);
|
|
allow = CheckJSValue(data.FindStringByDottedPath("filters.allow"));
|
|
allow_empty = CheckJSValue(data.FindStringByDottedPath("filters.allowEmpty"));
|
|
deny = CheckJSValue(data.FindStringByDottedPath("filters.deny"));
|
|
}
|
|
|
|
void ElectronAccessibilityUIMessageHandler::RequestNativeUITree(
|
|
const base::Value::List& args) {
|
|
const base::Value::Dict& data = args.front().GetDict();
|
|
|
|
std::string request_type, allow, allow_empty, deny;
|
|
GetRequestTypeAndFilters(data, request_type, allow, allow_empty, deny);
|
|
|
|
int window_id = *data.FindInt(kSessionIdField);
|
|
|
|
AllowJavascript();
|
|
|
|
std::vector<ui::AXPropertyFilter> property_filters;
|
|
AddPropertyFilters(property_filters, allow, ui::AXPropertyFilter::ALLOW);
|
|
AddPropertyFilters(property_filters, allow_empty,
|
|
ui::AXPropertyFilter::ALLOW_EMPTY);
|
|
AddPropertyFilters(property_filters, deny, ui::AXPropertyFilter::DENY);
|
|
|
|
for (auto* window : electron::WindowList::GetWindows()) {
|
|
if (window->window_id() == window_id) {
|
|
base::Value::Dict result = BuildTargetDescriptor(window);
|
|
gfx::NativeWindow native_window = window->GetNativeWindow();
|
|
ui::AXPlatformNode* node =
|
|
ui::AXPlatformNode::FromNativeWindow(native_window);
|
|
result.Set(kTreeField, RecursiveDumpAXPlatformNodeAsString(
|
|
node, 0, property_filters));
|
|
FireWebUIListener(request_type, result);
|
|
return;
|
|
}
|
|
}
|
|
|
|
// No browser with the specified |id| was found.
|
|
base::Value::Dict result;
|
|
result.Set(kSessionIdField, window_id);
|
|
result.Set(kTypeField, kBrowser);
|
|
result.Set(kErrorField, "Window no longer exists.");
|
|
FireWebUIListener(request_type, result);
|
|
}
|
|
|
|
void ElectronAccessibilityUIMessageHandler::RegisterMessages() {
|
|
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
|
|
|
|
web_ui()->RegisterMessageCallback(
|
|
"toggleAccessibility",
|
|
base::BindRepeating(
|
|
&AccessibilityUIMessageHandler::ToggleAccessibilityForWebContents,
|
|
base::Unretained(this)));
|
|
web_ui()->RegisterMessageCallback(
|
|
"setGlobalFlag",
|
|
base::BindRepeating(&AccessibilityUIMessageHandler::SetGlobalFlag,
|
|
base::Unretained(this)));
|
|
web_ui()->RegisterMessageCallback(
|
|
"setGlobalString",
|
|
base::BindRepeating(&AccessibilityUIMessageHandler::SetGlobalString,
|
|
base::Unretained(this)));
|
|
web_ui()->RegisterMessageCallback(
|
|
"requestWebContentsTree",
|
|
base::BindRepeating(
|
|
&AccessibilityUIMessageHandler::RequestWebContentsTree,
|
|
base::Unretained(this)));
|
|
web_ui()->RegisterMessageCallback(
|
|
"requestNativeUITree",
|
|
base::BindRepeating(
|
|
&ElectronAccessibilityUIMessageHandler::RequestNativeUITree,
|
|
base::Unretained(this)));
|
|
#if defined(USE_AURA)
|
|
web_ui()->RegisterMessageCallback(
|
|
"requestWidgetsTree",
|
|
base::BindRepeating(&AccessibilityUIMessageHandler::RequestWidgetsTree,
|
|
base::Unretained(this)));
|
|
#endif
|
|
web_ui()->RegisterMessageCallback(
|
|
"requestAccessibilityEvents",
|
|
base::BindRepeating(
|
|
&AccessibilityUIMessageHandler::RequestAccessibilityEvents,
|
|
base::Unretained(this)));
|
|
}
|
|
|
|
// static
|
|
void ElectronAccessibilityUIMessageHandler::RegisterPrefs(
|
|
user_prefs::PrefRegistrySyncable* registry) {
|
|
const std::string_view default_api_type =
|
|
std::string_view(ui::AXApiType::Type(ui::AXApiType::kBlink));
|
|
registry->RegisterStringPref(prefs::kShownAccessibilityApiType,
|
|
std::string(default_api_type));
|
|
}
|