зеркало из https://github.com/mozilla/gecko-dev.git
Backout c5aae1b3dc3f (bug 1002632) for breaking animations in SVG-in-opentype fonts.
This commit is contained in:
Родитель
bb5ea3c237
Коммит
552a1eafab
|
@ -218,19 +218,6 @@ SVGDocumentWrapper::SetCurrentTime(float aTime)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
SVGDocumentWrapper::TickRefreshDriver()
|
||||
{
|
||||
nsCOMPtr<nsIPresShell> presShell;
|
||||
mViewer->GetPresShell(getter_AddRefs(presShell));
|
||||
if (presShell) {
|
||||
nsPresContext* presContext = presShell->GetPresContext();
|
||||
if (presContext) {
|
||||
presContext->RefreshDriver()->DoTick();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** nsIStreamListener methods **/
|
||||
|
||||
/* void onDataAvailable (in nsIRequest request, in nsISupports ctxt,
|
||||
|
|
|
@ -137,7 +137,6 @@ public:
|
|||
void ResetAnimation();
|
||||
float GetCurrentTime();
|
||||
void SetCurrentTime(float aTime);
|
||||
void TickRefreshDriver();
|
||||
|
||||
/**
|
||||
* Force a layout flush of the underlying SVG document.
|
||||
|
|
|
@ -540,10 +540,9 @@ VectorImage::RequestRefresh(const TimeStamp& aTime)
|
|||
return;
|
||||
}
|
||||
|
||||
// TODO: Implement for b666446.
|
||||
EvaluateAnimation();
|
||||
|
||||
mSVGDocumentWrapper->TickRefreshDriver();
|
||||
|
||||
if (mHasPendingInvalidation) {
|
||||
SendInvalidationNotifications();
|
||||
mHasPendingInvalidation = false;
|
||||
|
|
|
@ -856,13 +856,6 @@ nsRefreshDriver::EnsureTimerStarted(bool aAdjustingTimer)
|
|||
return;
|
||||
}
|
||||
|
||||
if (mPresContext->Document()->IsBeingUsedAsImage()) {
|
||||
// Image documents receive ticks from clients' refresh drivers.
|
||||
MOZ_ASSERT(!mActiveTimer,
|
||||
"image document refresh driver should never have its own timer");
|
||||
return;
|
||||
}
|
||||
|
||||
// We got here because we're either adjusting the time *or* we're
|
||||
// starting it for the first time. Add to the right timer,
|
||||
// prehaps removing it from a previously-set one.
|
||||
|
|
Загрузка…
Ссылка в новой задаче