diff -r 000000000000 -r 6474c204b198 image/src/FrozenImage.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/image/src/FrozenImage.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,123 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "FrozenImage.h"
+
+using namespace mozilla::gfx;
+
+namespace mozilla {
+namespace image {
+
+NS_IMPL_ISUPPORTS(FrozenImage, imgIContainer)
+
+nsIntRect
+FrozenImage::FrameRect(uint32_t /* aWhichFrame - ignored */)
+{
+  return InnerImage()->FrameRect(FRAME_FIRST);
+}
+
+void
+FrozenImage::IncrementAnimationConsumers()
+{
+  // Do nothing. This will prevent animation from starting if there are no other
+  // instances of this image.
+}
+
+void
+FrozenImage::DecrementAnimationConsumers()
+{
+  // Do nothing.
+}
+
+NS_IMETHODIMP
+FrozenImage::GetAnimated(bool* aAnimated)
+{
+  bool dummy;
+  nsresult rv = InnerImage()->GetAnimated(&dummy);
+  if (NS_SUCCEEDED(rv)) {
+    *aAnimated = false;
+  }
+  return rv;
+}
+
+NS_IMETHODIMP_(TemporaryRef<SourceSurface>)
+FrozenImage::GetFrame(uint32_t aWhichFrame,
+                      uint32_t aFlags)
+{
+  return InnerImage()->GetFrame(FRAME_FIRST, aFlags);
+}
+
+NS_IMETHODIMP_(bool)
+FrozenImage::FrameIsOpaque(uint32_t aWhichFrame)
+{
+  return InnerImage()->FrameIsOpaque(FRAME_FIRST);
+}
+
+NS_IMETHODIMP
+FrozenImage::GetImageContainer(layers::LayerManager* aManager,
+                               layers::ImageContainer** _retval)
+{
+  // XXX(seth): GetImageContainer does not currently support anything but the
+  // current frame. We work around this by always returning null, but if it ever
+  // turns out that FrozenImage is widely used on codepaths that can actually
+  // benefit from GetImageContainer, it would be a good idea to fix that method
+  // for performance reasons.
+
+  *_retval = nullptr;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+FrozenImage::Draw(gfxContext* aContext,
+                  GraphicsFilter aFilter,
+                  const gfxMatrix& aUserSpaceToImageSpace,
+                  const gfxRect& aFill,
+                  const nsIntRect& aSubimage,
+                  const nsIntSize& aViewportSize,
+                  const SVGImageContext* aSVGContext,
+                  uint32_t /* aWhichFrame - ignored */,
+                  uint32_t aFlags)
+{
+  return InnerImage()->Draw(aContext, aFilter, aUserSpaceToImageSpace,
+                            aFill, aSubimage, aViewportSize, aSVGContext,
+                            FRAME_FIRST, aFlags);
+}
+
+NS_IMETHODIMP_(void)
+FrozenImage::RequestRefresh(const mozilla::TimeStamp& aTime)
+{
+  // Do nothing.
+}
+
+NS_IMETHODIMP
+FrozenImage::GetAnimationMode(uint16_t* aAnimationMode)
+{
+  *aAnimationMode = kNormalAnimMode;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+FrozenImage::SetAnimationMode(uint16_t aAnimationMode)
+{
+  // Do nothing.
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+FrozenImage::ResetAnimation()
+{
+  // Do nothing.
+  return NS_OK;
+}
+
+NS_IMETHODIMP_(float)
+FrozenImage::GetFrameIndex(uint32_t aWhichFrame)
+{
+  MOZ_ASSERT(aWhichFrame <= FRAME_MAX_VALUE, "Invalid argument");
+  return 0;
+}
+
+} // namespace image
+} // namespace mozilla