summaryrefslogtreecommitdiff
path: root/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-02-04 17:20:24 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-02-12 08:15:25 +0000
commit8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b (patch)
tree788d8d7549712682703a0310ca4a0f0860d4802b /chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
parent606d85f2a5386472314d39923da28c70c60dc8e7 (diff)
downloadqtwebengine-chromium-8fa0776f1f79e91fc9c0b9c1ba11a0a29c05196b.tar.gz
BASELINE: Update Chromium to 98.0.4758.90
Change-Id: Ib7c41539bf8a8e0376bd639f27d68294de90f3c8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/accessibility/browser_accessibility_manager_win.cc')
-rw-r--r--chromium/content/browser/accessibility/browser_accessibility_manager_win.cc26
1 files changed, 2 insertions, 24 deletions
diff --git a/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc b/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
index f00c7f9b114..4dfd0dcb6bf 100644
--- a/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
+++ b/chromium/content/browser/accessibility/browser_accessibility_manager_win.cc
@@ -262,7 +262,7 @@ void BrowserAccessibilityManagerWin::FireGeneratedEvent(
// Fire the event on the root object, which in the absence of a text
// field ancestor is the closest UIA text provider (other than the
// focused object) in which the selection has changed.
- DCHECK(node->IsPlatformDocument());
+ DCHECK(ui::IsPlatformDocument(node->GetRole()));
EnqueueSelectionChangedEvent(*node);
// "IA2_EVENT_TEXT_CARET_MOVED" should only be fired when a visible
@@ -708,28 +708,6 @@ bool BrowserAccessibilityManagerWin::CanFireEvents() const {
GetDelegateFromRootManager()->AccessibilityGetAcceleratedWidget();
}
-gfx::Rect BrowserAccessibilityManagerWin::GetViewBoundsInScreenCoordinates()
- const {
- // We have to take the device scale factor into account on Windows.
- BrowserAccessibilityDelegate* delegate = GetDelegateFromRootManager();
- if (delegate) {
- gfx::Rect bounds = delegate->AccessibilityGetViewBounds();
-
- // http://www.chromium.org/developers/design-documents/blink-coordinate-spaces
- // The bounds returned by the delegate are always in device-independent
- // pixels (DIPs), meaning physical pixels divided by device scale factor
- // (DSF). However, if UseZoomForDSF is enabled, then Blink does not apply
- // DSF when going from physical to screen pixels. In that case, we need to
- // multiply DSF back in to get to Blink's notion of "screen pixels."
- if (IsUseZoomForDSFEnabled() && device_scale_factor() > 0.0 &&
- device_scale_factor() != 1.0) {
- bounds = ScaleToEnclosingRect(bounds, device_scale_factor());
- }
- return bounds;
- }
- return gfx::Rect();
-}
-
void BrowserAccessibilityManagerWin::OnSubtreeWillBeDeleted(ui::AXTree* tree,
ui::AXNode* node) {
BrowserAccessibility* obj = GetFromAXNode(node);
@@ -950,7 +928,7 @@ void BrowserAccessibilityManagerWin::BeforeAccessibilityEvents() {
for (const auto& targeted_event : event_generator()) {
if (targeted_event.event_params.event ==
ui::AXEventGenerator::Event::IGNORED_CHANGED) {
- BrowserAccessibility* event_target = GetFromAXNode(targeted_event.node);
+ BrowserAccessibility* event_target = GetFromID(targeted_event.node_id);
if (!event_target)
continue;