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

Bug 1737454 - Make sure to reset remaining blink count if we call ResetBlinking. r=jfkthame

Browse Source 
Regardless of whether we're stopped/the blink rate is the same.

Differential Revision: https://phabricator.services.mozilla.com/D130346
This commit is contained in:
Emilio Cobos Álvarez 2021-11-04 12:35:19 +00:00
parent cd762ef3c8
commit 7662f8bdf5
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
layout/base/nsCaret.cpp
View File

@ -47,9 +47,6 @@ using EmbeddingLevel = mozilla::intl::Bidi::EmbeddingLevel;
// an insignificant dot
static const int32_t kMinBidiIndicatorPixels = 2;
// The default caret blinking rate (in ms of blinking interval)
static const uint32_t kDefaultCaretBlinkRate = 500;
/**
* Find the first frame in an in-order traversal of the frame subtree rooted
* at aFrame which is either a text frame logically at the end of a line,
@ -600,6 +597,13 @@ nsCaret::NotifySelectionChanged(Document*, Selection* aDomSel,
}
void nsCaret::ResetBlinking() {
using IntID = LookAndFeel::IntID;
// The default caret blinking rate (in ms of blinking interval)
constexpr uint32_t kDefaultBlinkRate = 500;
// The default caret blinking count (-1 for "never stop blinking")
constexpr int32_t kDefaultBlinkCount = -1;
mIsBlinkOn = true;
if (mReadOnly || !mVisible || mHideCount) {
@ -607,12 +611,21 @@ void nsCaret::ResetBlinking() {
return;
}
uint32_t blinkRate = static_cast<uint32_t>(LookAndFeel::GetInt(
LookAndFeel::IntID::CaretBlinkTime, kDefaultCaretBlinkRate));
auto blinkRate =
uint32_t(LookAndFeel::GetInt(IntID::CaretBlinkTime, kDefaultBlinkRate));
if (blinkRate > 0) {
// Make sure to reset the remaining blink count even if the blink rate
// hasn't changed.
mBlinkCount =
LookAndFeel::GetInt(IntID::CaretBlinkCount, kDefaultBlinkCount);
}
if (mBlinkRate == blinkRate) {
// If the rate hasn't changed, then there is nothing to do.
// If the rate hasn't changed, then there is nothing else to do.
return;
}
mBlinkRate = blinkRate;
if (mBlinkTimer) {
@ -632,7 +645,6 @@ void nsCaret::ResetBlinking() {
}
if (blinkRate > 0) {
mBlinkCount = LookAndFeel::GetInt(LookAndFeel::IntID::CaretBlinkCount, -1);
mBlinkTimer->InitWithNamedFuncCallback(CaretBlinkCallback, this, blinkRate,
nsITimer::TYPE_REPEATING_SLACK,
"nsCaret::CaretBlinkCallback_timer");