diff --git a/image/src/SVGDocumentWrapper.cpp b/image/src/SVGDocumentWrapper.cpp index b7d086b243a8..b4c04e7ce506 100644 --- a/image/src/SVGDocumentWrapper.cpp +++ b/image/src/SVGDocumentWrapper.cpp @@ -218,19 +218,6 @@ SVGDocumentWrapper::SetCurrentTime(float aTime) } } -void -SVGDocumentWrapper::TickRefreshDriver() -{ - nsCOMPtr 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, diff --git a/image/src/SVGDocumentWrapper.h b/image/src/SVGDocumentWrapper.h index 4904592b0eed..425036b1ccaa 100644 --- a/image/src/SVGDocumentWrapper.h +++ b/image/src/SVGDocumentWrapper.h @@ -137,7 +137,6 @@ public: void ResetAnimation(); float GetCurrentTime(); void SetCurrentTime(float aTime); - void TickRefreshDriver(); /** * Force a layout flush of the underlying SVG document. diff --git a/image/src/VectorImage.cpp b/image/src/VectorImage.cpp index 45cf49f310dd..d36252bdb39a 100644 --- a/image/src/VectorImage.cpp +++ b/image/src/VectorImage.cpp @@ -540,10 +540,9 @@ VectorImage::RequestRefresh(const TimeStamp& aTime) return; } + // TODO: Implement for b666446. EvaluateAnimation(); - mSVGDocumentWrapper->TickRefreshDriver(); - if (mHasPendingInvalidation) { SendInvalidationNotifications(); mHasPendingInvalidation = false; diff --git a/layout/base/nsRefreshDriver.cpp b/layout/base/nsRefreshDriver.cpp index 3bf8b02d718a..18ecc5085f80 100644 --- a/layout/base/nsRefreshDriver.cpp +++ b/layout/base/nsRefreshDriver.cpp @@ -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.