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

Bug 1685303: part 24) Encapsulate LayoutFlusher from AccessibleCaretManager. r=TYLin

Browse Source 
Encapsulates flushing-related functionality.

Please see part 25) for further simplifcation of `LayoutFlusher`.

Depends on D102413

Differential Revision: https://phabricator.services.mozilla.com/D102414
This commit is contained in:
Mirko Brodesser 2021-01-20 23:31:42 +00:00
parent 4a9742216a
commit f7d4eee8e5
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
layout/base/AccessibleCaretManager.cpp
View File

@ -87,7 +87,8 @@ AccessibleCaretManager::AccessibleCaretManager(PresShell* aPresShell)
}
AccessibleCaretManager::~AccessibleCaretManager() {
MOZ_RELEASE_ASSERT(!mFlushingLayout, "Going away in MaybeFlushLayout? Bad!");
MOZ_RELEASE_ASSERT(!mLayoutFlusher.mFlushing,
"Going away in mLayoutFlusher.MaybeFlush? Bad!");
}
void AccessibleCaretManager::Terminate() {
@ -182,7 +183,7 @@ void AccessibleCaretManager::HideCaretsAndDispatchCaretStateChangedEvent() {
}
void AccessibleCaretManager::UpdateCarets(const UpdateCaretsHintSet& aHint) {
if (MaybeFlushLayout() == Terminated::Yes) {
if (mLayoutFlusher.MaybeFlush(*this) == Terminated::Yes) {
return;
}
@ -345,7 +346,7 @@ void AccessibleCaretManager::UpdateCaretsForSelectionMode(
if (mIsCaretPositionChanged) {
// Flush layout to make the carets intersection correct.
if (MaybeFlushLayout() == Terminated::Yes) {
if (mLayoutFlusher.MaybeFlush(*this) == Terminated::Yes) {
return;
}
}
@ -672,8 +673,8 @@ nsresult AccessibleCaretManager::SelectWordOrShortcut(const nsPoint& aPoint) {
void AccessibleCaretManager::OnScrollStart() {
AC_LOG("%s", __FUNCTION__);
AutoRestore<bool> saveAllowFlushingLayout(mAllowFlushingLayout);
mAllowFlushingLayout = false;
AutoRestore<bool> saveAllowFlushingLayout(mLayoutFlusher.mAllowFlushing);
mLayoutFlusher.mAllowFlushing = false;
Maybe<PresShell::AutoAssertNoFlush> assert;
if (mPresShell) {
@ -690,8 +691,8 @@ void AccessibleCaretManager::OnScrollStart() {
}
void AccessibleCaretManager::OnScrollEnd() {
AutoRestore<bool> saveAllowFlushingLayout(mAllowFlushingLayout);
mAllowFlushingLayout = false;
AutoRestore<bool> saveAllowFlushingLayout(mLayoutFlusher.mAllowFlushing);
mLayoutFlusher.mAllowFlushing = false;
Maybe<PresShell::AutoAssertNoFlush> assert;
if (mPresShell) {
@ -721,8 +722,8 @@ void AccessibleCaretManager::OnScrollEnd() {
}
void AccessibleCaretManager::OnScrollPositionChanged() {
AutoRestore<bool> saveAllowFlushingLayout(mAllowFlushingLayout);
mAllowFlushingLayout = false;
AutoRestore<bool> saveAllowFlushingLayout(mLayoutFlusher.mAllowFlushing);
mLayoutFlusher.mAllowFlushing = false;
Maybe<PresShell::AutoAssertNoFlush> assert;
if (mPresShell) {
@ -745,8 +746,8 @@ void AccessibleCaretManager::OnScrollPositionChanged() {
}
void AccessibleCaretManager::OnReflow() {
AutoRestore<bool> saveAllowFlushingLayout(mAllowFlushingLayout);
mAllowFlushingLayout = false;
AutoRestore<bool> saveAllowFlushingLayout(mLayoutFlusher.mAllowFlushing);
mLayoutFlusher.mAllowFlushing = false;
Maybe<PresShell::AutoAssertNoFlush> assert;
if (mPresShell) {
@ -827,7 +828,7 @@ nsAutoString AccessibleCaretManager::StringifiedSelection() const {
nsAutoString str;
RefPtr<Selection> selection = GetSelection();
if (selection) {
selection->Stringify(str, mAllowFlushingLayout
selection->Stringify(str, mLayoutFlusher.mAllowFlushing
? Selection::FlushFrames::Yes
: Selection::FlushFrames::No);
}
@ -1024,17 +1025,18 @@ void AccessibleCaretManager::ClearMaintainedSelection() const {
}
}
auto AccessibleCaretManager::MaybeFlushLayout() -> Terminated {
if (mPresShell && mAllowFlushingLayout) {
AutoRestore<bool> flushing(mFlushingLayout);
mFlushingLayout = true;
auto AccessibleCaretManager::LayoutFlusher::MaybeFlush(
const AccessibleCaretManager& aAccessibleCaretManager) -> Terminated {
if (aAccessibleCaretManager.mPresShell && mAllowFlushing) {
AutoRestore<bool> flushing(mFlushing);
mFlushing = true;
if (Document* doc = mPresShell->GetDocument()) {
if (Document* doc = aAccessibleCaretManager.mPresShell->GetDocument()) {
doc->FlushPendingNotifications(FlushType::Layout);
}
}
return IsTerminated();
return aAccessibleCaretManager.IsTerminated();
}
nsIFrame* AccessibleCaretManager::GetFrameForFirstRangeStartOrLastRangeEnd(
@ -1403,7 +1405,7 @@ void AccessibleCaretManager::StopSelectionAutoScrollTimer() const {
void AccessibleCaretManager::DispatchCaretStateChangedEvent(
CaretChangedReason aReason) {
if (MaybeFlushLayout() == Terminated::Yes) {
if (mLayoutFlusher.MaybeFlush(*this) == Terminated::Yes) {
return;
}

33
layout/base/AccessibleCaretManager.h
View File

@ -231,14 +231,6 @@ class AccessibleCaretManager {
enum class Terminated : bool { No, Yes };
// This method could kill the shell, so callers to methods that call
// MaybeFlushLayout should ensure the event hub that owns us is still alive.
//
// See the mRefCnt assertions in AccessibleCaretEventHub.
//
// @return IsTerminated().
[[nodiscard]] MOZ_CAN_RUN_SCRIPT Terminated MaybeFlushLayout();
static dom::Element* GetEditingHostForFrame(const nsIFrame* aFrame);
dom::Selection* GetSelection() const;
already_AddRefed<nsFrameSelection> GetFrameSelection() const;
@ -335,12 +327,27 @@ class AccessibleCaretManager {
// Set to true in OnScrollStart() and set to false in OnScrollEnd().
bool mIsScrollStarted = false;
// Whether we're flushing layout, used for sanity-checking.
bool mFlushingLayout = false;
class LayoutFlusher final {
public:
// This method could kill the shell, so callers to methods that call
// MaybeFlush should ensure the event hub that owns us is still alive.
//
// See the mRefCnt assertions in AccessibleCaretEventHub.
//
// @return aAccessibleCaretManager.IsTerminated().
[[nodiscard]] MOZ_CAN_RUN_SCRIPT Terminated
MaybeFlush(const AccessibleCaretManager& aAccessibleCaretManager);
// Set to false to disallow flushing layout in some callbacks such as
// OnReflow(), OnScrollStart(), OnScrollStart(), or OnScrollPositionChanged().
bool mAllowFlushingLayout = true;
// Whether we're flushing layout, used for sanity-checking.
bool mFlushing = false;
// Set to false to disallow flushing layout in some callbacks such as
// OnReflow(), OnScrollStart(), OnScrollStart(), or
// OnScrollPositionChanged().
bool mAllowFlushing = true;
};
LayoutFlusher mLayoutFlusher;
// Set to True if one of the caret's position is changed in last update.
bool mIsCaretPositionChanged = false;