Skip to content

GitLab

T
tangled
Commit 7bdfca43 authored by Maggie Cai's avatar Maggie Cai Committed by Commit Bot
Browse files
Options

Revert "Docked Magnifier Sends OnMagnifierBoundsChanged Events" 

This reverts commit 4fc657cd.

Reason for revert: This CL is likely the cause for bot failures for  Linux ChromiumOS MSan Tests and Linux Chromium OS ASan LSan Tests (1)
First fail occurance: https://ci.chromium.org/p/chromium/builders/ci/Linux%20Chromium%20OS%20ASan%20LSan%20Tests%20%281%29/38932 and https://ci.chromium.org/p/chromium/builders/ci/Linux%20ChromiumOS%20MSan%20Tests/21447
Failed tests: DockedMagnifierE2ETest.MovesDockedMagnifierToActiveDescendant

Original change's description:
> Docked Magnifier Sends OnMagnifierBoundsChanged Events
>
> AX-Relnotes: N/A
> Bug: 1151216
> Change-Id: I222ec5d29ae2fd06689d6d94876f4fa6973e4c2a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2552163
> Commit-Queue: Josiah Krutz <josiahk@google.com>
> Reviewed-by: Ahmed Fakhry <afakhry@chromium.org>
> Reviewed-by: David Tseng <dtseng@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#830905}

TBR=dtseng@chromium.org,afakhry@chromium.org,josiahk@google.com

Change-Id: Ie16bef08dded2618730f63d3930bb46e884e7ea1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1151216
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560332
Commit-Queue: Maggie Cai <mxcai@chromium.org>
Reviewed-by: default avatarMaggie Cai <mxcai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#831246}
parent 74a9bdea
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 128 deletions
ash/magnifier/docked_magnifier_controller_impl.cc
View file @ 7bdfca43
......@@ -235,9 +235,8 @@ void DockedMagnifierControllerImpl::CenterOnPoint(
// 1- Scale the layer by |scale|.
// 2- Translate the point of interest to the center point of the viewport
// widget.
const gfx::Rect viewport_widget_bounds =
GetViewportWidgetBoundsInRoot(current_source_root_window_);
const gfx::Point viewport_center_point = viewport_widget_bounds.CenterPoint();
const gfx::Point viewport_center_point =
GetViewportWidgetBoundsInRoot(current_source_root_window_).CenterPoint();
gfx::Transform transform;
transform.Translate(viewport_center_point.x() - point_in_pixels.x(),
viewport_center_point.y() - point_in_pixels.y());
......@@ -253,29 +252,6 @@ void DockedMagnifierControllerImpl::CenterOnPoint(
settings.SetTweenType(gfx::Tween::ZERO);
settings.SetPreemptionStrategy(ui::LayerAnimator::IMMEDIATELY_SET_NEW_TARGET);
viewport_magnifier_layer_->SetTransform(transform);
// Also make sure |point_of_interest|'s y-coordinate doesn't go below
// the minimum height.
if (point_of_interest.y() < minimum_point_of_interest_height_)
point_of_interest.set_y(minimum_point_of_interest_height_);
// Send changed magnified region bounds to accessibility controller,
// triggering accessibility manager to dispatch an accessibility private
// OnMagnifierBoundsChanged event, which will be listened for by magnifier.js,
// which keeps track of the last magnified region bounds, to help when
// deciding where to next move the magnified region.
// |viewport_widget_bounds| represents the full-width docked magnifier panel
// at the top of the screen. Shrink this by the current magnifier |scale| to
// get the actual zoomed-in width and height of the magnified area.
const int width = viewport_widget_bounds.width() / scale;
const int height = viewport_widget_bounds.height() / scale;
const int x = point_of_interest.x() - width / 2;
const int y = point_of_interest.y() - height / 2;
gfx::Rect magnified_region_bounds(x, y, width, height);
::wm::ConvertRectToScreen(root_window, &magnified_region_bounds);
Shell::Get()->accessibility_controller()->MagnifierBoundsChanged(
magnified_region_bounds);
}
int DockedMagnifierControllerImpl::GetMagnifierHeightForTesting() const {
......
chrome/browser/resources/chromeos/accessibility/accessibility_common/BUILD.gn
View file @ 7bdfca43
......@@ -61,7 +61,6 @@ js2gtest("accessibility_common_extjs_tests") {
sources = [
"accessibility_common_test.js",
"autoclick/autoclick_test.js",
"magnifier/docked_magnifier_test.js",
"magnifier/magnifier_test.js",
]
gen_include_files = [
......@@ -69,7 +68,6 @@ js2gtest("accessibility_common_extjs_tests") {
"../common/testing/callback_helper.js",
"../common/testing/e2e_test_base.js",
"../common/testing/mock_accessibility_private.js",
"magnifier/magnifier_test_common.js",
]
# The test base classes generate C++ code with these deps.
......
chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/docked_magnifier_test.js deleted 100644 → 0
View file @ 74a9bdea
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
GEN_INCLUDE(['../../common/testing/e2e_test_base.js']);
GEN_INCLUDE(['../../common/testing/mock_accessibility_private.js']);
GEN_INCLUDE(['../../common/rect_util.js']);
GEN_INCLUDE(['magnifier_test_common.js']);
/**
* Magnifier feature using accessibility common extension browser tests.
*/
DockedMagnifierE2ETest = class extends E2ETestBase {
constructor() {
super();
window.RoleType = chrome.automation.RoleType;
}
async getNextMagnifierBounds() {
return new Promise(resolve => {
const listener = (magnifierBounds) => {
chrome.accessibilityPrivate.onMagnifierBoundsChanged.removeListener(
listener);
resolve(magnifierBounds);
};
chrome.accessibilityPrivate.onMagnifierBoundsChanged.addListener(
listener);
});
}
/** @override */
testGenCppIncludes() {
super.testGenCppIncludes();
GEN(`
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
#include "chrome/common/extensions/extension_constants.h"
#include "content/public/test/browser_test.h"
`);
}
/** @override */
testGenPreamble() {
super.testGenPreamble();
GEN(`
base::Closure load_cb =
base::Bind(&chromeos::MagnificationManager::SetDockedMagnifierEnabled,
base::Unretained(chromeos::MagnificationManager::Get()),
true);
WaitForExtension(extension_misc::kAccessibilityCommonExtensionId, load_cb);
`);
}
};
TEST_F(
'DockedMagnifierE2ETest', 'MovesDockedMagnifierToActiveDescendant',
function() {
this.runWithLoadedTree(ActiveDescendantSite, async function(root) {
const top = root.find({attributes: {name: 'Top'}});
const banana = root.find({attributes: {name: 'Banana'}});
const group = root.find({role: RoleType.GROUP});
// Focus and move magnifier to top.
top.focus();
// Verify magnifier contain top and not banana.
let bounds = await this.getNextMagnifierBounds();
assertTrue(RectUtil.contains(bounds, top.location));
assertFalse(RectUtil.contains(bounds, banana.location));
// Click group to change active descendant to banana.
group.doDefault();
// Verify magnifier bounds contain banana.
bounds = await this.getNextMagnifierBounds();
assertFalse(RectUtil.contains(bounds, top.location));
assertTrue(RectUtil.contains(bounds, banana.location));
});
});
chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier_test.js
View file @ 7bdfca43
......@@ -5,7 +5,6 @@
GEN_INCLUDE(['../../common/testing/e2e_test_base.js']);
GEN_INCLUDE(['../../common/testing/mock_accessibility_private.js']);
GEN_INCLUDE(['../../common/rect_util.js']);
GEN_INCLUDE(['magnifier_test_common.js']);
/**
* Magnifier feature using accessibility common extension browser tests.
......@@ -94,9 +93,64 @@ TEST_F('MagnifierE2ETest', 'MovesScreenMagnifierToFocusedElement', function() {
});
});
// Disabled - flaky: https://crbug.com/1145612
TEST_F(
'MagnifierE2ETest', 'DISABLED_MovesDockedMagnifierToActiveDescendant', function() {
const site = `
<div role="group" id="parent" aria-activedescendant="apple">
<div id="apple" role="treeitem">Apple</div>
<div id="banana" role="treeitem">Banana</div>
</div>
<script>
const parent = document.getElementById('parent');
parent.addEventListener('click', function() {
parent.setAttribute('aria-activedescendant', 'banana');
});
</script>
`;
this.runWithLoadedTree(site, async function(root) {
// Enable docked magnifier.
await new Promise(resolve => {
chrome.accessibilityFeatures.dockedMagnifier.set(
{value: true}, resolve);
});
// Validate magnifier wants to move to root.
const rootLocation = await getNextMagnifierLocation();
assertTrue(RectUtil.equal(rootLocation, root.location));
// Click parent to change active descendant from apple to banana.
const parent = root.find({role: RoleType.GROUP});
parent.doDefault();
// Register and wait for rect from magnifier.
const rect = await getNextMagnifierLocation();
// Validate rect from magnifier is rect of banana.
const bananaNode =
root.find({role: RoleType.TREE_ITEM, attributes: {name: 'Banana'}});
assertTrue(RectUtil.equal(rect, bananaNode.location));
}, {returnPage: true});
});
TEST_F(
'MagnifierE2ETest', 'MovesScreenMagnifierToActiveDescendant', function() {
this.runWithLoadedTree(ActiveDescendantSite, async function(root) {
const site = `
<span tabindex="1">Top</span>
<div id="group" role="group" style="width: 200px"
aria-activedescendant="apple">
<div id="apple" role="treeitem">Apple</div>
<div id="banana" role="treeitem" style="margin-top: 400px">Banana</div>
</div>
<script>
const group = document.getElementById('group');
group.addEventListener('click', function() {
group.setAttribute('aria-activedescendant', 'banana');
});
</script>
`;
this.runWithLoadedTree(site, async function(root) {
const top = root.find({attributes: {name: 'Top'}});
const banana = root.find({attributes: {name: 'Banana'}});
const group = root.find({role: RoleType.GROUP});
......
chrome/browser/resources/chromeos/accessibility/accessibility_common/magnifier/magnifier_test_common.js deleted 100644 → 0
View file @ 74a9bdea
// Copyright 2020 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
const ActiveDescendantSite = `
<span tabindex="1">Top</span>
<div id="group" role="group" style="width: 200px"
aria-activedescendant="apple">
<div id="apple" role="treeitem">Apple</div>
<div id="banana" role="treeitem" style="margin-top: 400px">
Banana
</div>
</div>
<script>
const group = document.getElementById('group');
group.addEventListener('click', function() {
group.setAttribute('aria-activedescendant', 'banana');
});
</script>
`;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment