Bug 811570 - Allow inactive scroll frames to become active when scrolled. r=roc

This commit is contained in:
Matt Woodrow 2012-11-19 17:19:22 +13:00
parent 14ea13dded
commit dffa997887
2 changed files with 4 additions and 4 deletions

View File

@ -1700,7 +1700,7 @@ bool nsGfxScrollFrameInner::IsAlwaysActive() const
// If we have scrolled before, then we should stay active.
if (mHasBeenScrolled) {
return true;
return true;
}
// If we're overflow:hidden, then start as inactive until
@ -1721,10 +1721,10 @@ void nsGfxScrollFrameInner::MarkInactive()
void nsGfxScrollFrameInner::MarkActive()
{
mScrollingActive = true;
if (IsAlwaysActive())
return;
mScrollingActive = true;
if (mActivityExpirationState.IsTracked()) {
gScrollFrameActivityTracker->MarkUsed(this);
} else {

View File

@ -13,8 +13,8 @@ HTTP == text-1.html text-1.html?ref
HTTP == text-2.html?up text-2.html?ref
HTTP == transformed-1.html transformed-1.html?ref
HTTP == transformed-1.html?up transformed-1.html?ref
== uncovering-1.html uncovering-1-ref.html
== uncovering-2.html uncovering-2-ref.html
fuzzy-if(Android,5,20000) == uncovering-1.html uncovering-1-ref.html
fuzzy-if(Android,5,20000) == uncovering-2.html uncovering-2-ref.html
== less-than-scrollbar-height.html less-than-scrollbar-height-ref.html
== huge-horizontal-overflow.html huge-horizontal-overflow-ref.html
== huge-vertical-overflow.html huge-vertical-overflow-ref.html