зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset fb331e03981a (bug 1271691) for perma failures in scroll-rounding.html a=merge
--HG-- extra : source : 920fe2a024f7392fc9801a6d06574c564d6dc844
This commit is contained in:
Родитель
9749648a79
Коммит
db37f46991
|
@ -905,11 +905,6 @@ public:
|
|||
*/
|
||||
bool IsPaintingSuppressed() const { return mPaintingSuppressed; }
|
||||
|
||||
/**
|
||||
* Update the painting suppression status and do unsuppress painting if needs.
|
||||
*/
|
||||
virtual void CheckIfTimeToUnsuppressPainting() = 0;
|
||||
|
||||
/**
|
||||
* Pause painting by freezing the refresh driver of this and all parent
|
||||
* presentations. This may not have the desired effect if this pres shell
|
||||
|
|
|
@ -1769,8 +1769,6 @@ PresShell::Initialize(nscoord aWidth, nscoord aHeight)
|
|||
mPaintSuppressionTimer->InitWithNamedFuncCallback(
|
||||
sPaintSuppressionCallback, this, delay, nsITimer::TYPE_ONE_SHOT,
|
||||
"PresShell::sPaintSuppressionCallback");
|
||||
|
||||
mPaintSuppressionExpectTime = TimeStamp::Now() + TimeDuration::FromMilliseconds(delay);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -6517,8 +6515,6 @@ PresShell::Paint(nsView* aViewToPaint,
|
|||
nsAutoNotifyDidPaint notifyDidPaint(this, aFlags);
|
||||
AutoUpdateHitRegion updateHitRegion(this, frame);
|
||||
|
||||
CheckIfTimeToUnsuppressPainting();
|
||||
|
||||
// Whether or not we should set first paint when painting is
|
||||
// suppressed is debatable. For now we'll do it because
|
||||
// B2G relies on first paint to configure the viewport and
|
||||
|
@ -11536,15 +11532,3 @@ nsIPresShell::HasRuleProcessorUsedByMultipleStyleSets(uint32_t aSheetType,
|
|||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
PresShell::CheckIfTimeToUnsuppressPainting()
|
||||
{
|
||||
if (!mPaintingSuppressed) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (TimeStamp::Now() >= mPaintSuppressionExpectTime) {
|
||||
UnsuppressPainting();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -422,8 +422,6 @@ public:
|
|||
|
||||
void SetNextPaintCompressed() { mNextPaintCompressed = true; }
|
||||
|
||||
virtual void CheckIfTimeToUnsuppressPainting() override;
|
||||
|
||||
protected:
|
||||
virtual ~PresShell();
|
||||
|
||||
|
@ -951,7 +949,6 @@ protected:
|
|||
// or all frames are constructed, we won't paint anything but
|
||||
// our <body> background and scrollbars.
|
||||
nsCOMPtr<nsITimer> mPaintSuppressionTimer;
|
||||
mozilla::TimeStamp mPaintSuppressionExpectTime;
|
||||
|
||||
nsCOMPtr<nsITimer> mDelayedPaintTimer;
|
||||
|
||||
|
|
|
@ -1671,8 +1671,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
|
|||
return;
|
||||
}
|
||||
|
||||
presShell->CheckIfTimeToUnsuppressPainting();
|
||||
|
||||
mResizeSuppressed = false;
|
||||
|
||||
AutoRestore<bool> restoreInRefresh(mInRefresh);
|
||||
|
|
Загрузка…
Ссылка в новой задаче