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

Bug 1688832: part 2) Add AccessibleCaretManager::Carets::AreLogicallyVisible. r=TYLin

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D102918
This commit is contained in:
Mirko Brodesser 2021-01-27 09:43:30 +00:00
parent 2d9fd75ccc
commit 5394d16b24
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
layout/base/AccessibleCaretManager.cpp
View File

@ -123,8 +123,7 @@ nsresult AccessibleCaretManager::OnSelectionChanged(Document* aDoc,
StaticPrefs::layout_accessiblecaret_script_change_update_mode());
if (mode == kScriptAlwaysShow ||
(mode == kScriptUpdateVisible &&
(mCarets.mFirst->IsLogicallyVisible() ||
mCarets.mSecond->IsLogicallyVisible()))) {
mCarets.AreLogicallyVisible())) {
UpdateCarets();
return NS_OK;
}
@ -174,8 +173,7 @@ nsresult AccessibleCaretManager::OnSelectionChanged(Document* aDoc,
}
void AccessibleCaretManager::HideCaretsAndDispatchCaretStateChangedEvent() {
if (mCarets.mFirst->IsLogicallyVisible() ||
mCarets.mSecond->IsLogicallyVisible()) {
if (mCarets.AreLogicallyVisible()) {
AC_LOG("%s", __FUNCTION__);
mCarets.mFirst->SetAppearance(Appearance::None);
mCarets.mSecond->SetAppearance(Appearance::None);
@ -699,8 +697,7 @@ void AccessibleCaretManager::OnScrollStart() {
mIsScrollStarted = true;
if (mCarets.mFirst->IsLogicallyVisible() ||
mCarets.mSecond->IsLogicallyVisible()) {
if (mCarets.AreLogicallyVisible()) {
// Dispatch the event only if one of the carets is logically visible like in
// HideCaretsAndDispatchCaretStateChangedEvent().
DispatchCaretStateChangedEvent(CaretChangedReason::Scroll);
@ -747,8 +744,7 @@ void AccessibleCaretManager::OnScrollPositionChanged() {
assert.emplace(*mPresShell);
}
if (mCarets.mFirst->IsLogicallyVisible() ||
mCarets.mSecond->IsLogicallyVisible()) {
if (mCarets.AreLogicallyVisible()) {
if (mIsScrollStarted) {
// We don't want extra CaretStateChangedEvents dispatched when user is
// scrolling the page.
@ -772,8 +768,7 @@ void AccessibleCaretManager::OnReflow() {
assert.emplace(*mPresShell);
}
if (mCarets.mFirst->IsLogicallyVisible() ||
mCarets.mSecond->IsLogicallyVisible()) {
if (mCarets.AreLogicallyVisible()) {
AC_LOG("%s: UpdateCarets(RespectOldAppearance)", __FUNCTION__);
UpdateCarets(UpdateCaretsHint::RespectOldAppearance);
}
@ -1480,8 +1475,7 @@ void AccessibleCaretManager::DispatchCaretStateChangedEvent(
init.mBoundingClientRect = domRect;
init.mReason = aReason;
init.mCollapsed = sel->IsCollapsed();
init.mCaretVisible = mCarets.mFirst->IsLogicallyVisible() ||
mCarets.mSecond->IsLogicallyVisible();
init.mCaretVisible = mCarets.AreLogicallyVisible();
init.mCaretVisuallyVisible = mCarets.mFirst->IsVisuallyVisible() ||
mCarets.mSecond->IsVisuallyVisible();
init.mSelectedTextContent = StringifiedSelection();

8
layout/base/AccessibleCaretManager.h
View File

@ -314,7 +314,13 @@ class AccessibleCaretManager {
// nullptr either we are in gtest or PresShell::IsDestroying() is true.
PresShell* MOZ_NON_OWNING_REF mPresShell = nullptr;
struct Carets {
class Carets {
public:
// See `AccessibleCaret::IsLogicallyVisible`.
bool AreLogicallyVisible() const {
return mFirst->IsLogicallyVisible() || mSecond->IsLogicallyVisible();
}
// First caret is attached to nsCaret in cursor mode, and is attached to
// selection highlight as the left caret in selection mode.
UniquePtr<AccessibleCaret> mFirst;