mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-12 21:05:36 +00:00
Backed out changeset 665b48fbfd28 (bug 553075) to see if it was responsible for 1% SVG/DHTML regressions on Win7.
This commit is contained in:
parent
123fe58292
commit
99bd0c16e4
@ -81,7 +81,6 @@ GetRefreshDriverForDoc(nsIDocument* aDoc)
|
||||
|
||||
nsSMILAnimationController::nsSMILAnimationController()
|
||||
: mResampleNeeded(PR_FALSE),
|
||||
mDeferredStartSampling(PR_FALSE),
|
||||
mDocument(nsnull)
|
||||
{
|
||||
mAnimationElementTable.Init();
|
||||
@ -151,11 +150,7 @@ nsSMILAnimationController::Resume(PRUint32 aType)
|
||||
|
||||
if (wasPaused && !mPauseState && mChildContainerTable.Count()) {
|
||||
Sample(); // Run the first sample manually
|
||||
if (mAnimationElementTable.Count()) {
|
||||
StartSampling(GetRefreshDriverForDoc(mDocument));
|
||||
} else {
|
||||
mDeferredStartSampling = PR_TRUE;
|
||||
}
|
||||
StartSampling(GetRefreshDriverForDoc(mDocument));
|
||||
}
|
||||
}
|
||||
|
||||
@ -190,14 +185,6 @@ nsSMILAnimationController::RegisterAnimationElement(
|
||||
nsISMILAnimationElement* aAnimationElement)
|
||||
{
|
||||
mAnimationElementTable.PutEntry(aAnimationElement);
|
||||
if (mDeferredStartSampling) {
|
||||
// mAnimationElementTable was empty until we just inserted its first element
|
||||
NS_ABORT_IF_FALSE(mAnimationElementTable.Count() == 1,
|
||||
"we shouldn't have deferred sampling if we already had "
|
||||
"animations registered");
|
||||
mDeferredStartSampling = PR_FALSE;
|
||||
StartSampling(GetRefreshDriverForDoc(mDocument));
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@ -708,11 +695,7 @@ nsSMILAnimationController::AddChild(nsSMILTimeContainer& aChild)
|
||||
|
||||
if (!mPauseState && mChildContainerTable.Count() == 1) {
|
||||
Sample(); // Run the first sample manually
|
||||
if (mAnimationElementTable.Count()) {
|
||||
StartSampling(GetRefreshDriverForDoc(mDocument));
|
||||
} else {
|
||||
mDeferredStartSampling = PR_TRUE;
|
||||
}
|
||||
StartSampling(GetRefreshDriverForDoc(mDocument));
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
|
@ -183,7 +183,6 @@ protected:
|
||||
AnimationElementHashtable mAnimationElementTable;
|
||||
TimeContainerHashtable mChildContainerTable;
|
||||
PRPackedBool mResampleNeeded;
|
||||
PRPackedBool mDeferredStartSampling;
|
||||
|
||||
// Store raw ptr to mDocument. It owns the controller, so controller
|
||||
// shouldn't outlive it
|
||||
|
Loading…
Reference in New Issue
Block a user