diff -r 000000000000 -r 6474c204b198 image/src/ImageFactory.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/image/src/ImageFactory.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,87 @@
+/* -*- 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/. */
+
+#ifndef MOZILLA_IMAGELIB_IMAGEFACTORY_H_
+#define MOZILLA_IMAGELIB_IMAGEFACTORY_H_
+
+#include "nsCOMPtr.h"
+#include "nsProxyRelease.h"
+
+class nsCString;
+class nsIRequest;
+class imgStatusTracker;
+
+namespace mozilla {
+namespace image {
+
+class Image;
+class ImageURL;
+
+class ImageFactory
+{
+public:
+  /**
+   * Registers vars with Preferences. Should only be called on the main thread.
+   */
+  static void Initialize();
+
+  /**
+   * Determines whether it's safe to retarget OnDataAvailable for an image.
+   *
+   * @param aURI          The URI of the image.
+   * @param aIsMultipart  Whether the image is part of a multipart request.
+   */
+  static bool CanRetargetOnDataAvailable(ImageURL* aURI, bool aIsMultiPart);
+
+  /**
+   * Creates a new image with the given properties.
+   * Can be called on or off the main thread.
+   *
+   * @param aRequest       The associated request.
+   * @param aStatusTracker A status tracker for the image to use.
+   * @param aMimeType      The mimetype of the image.
+   * @param aURI           The URI of the image.
+   * @param aIsMultiPart   Whether the image is part of a multipart request.
+   * @param aInnerWindowId The window this image belongs to.
+   */
+  static already_AddRefed<Image> CreateImage(nsIRequest* aRequest,
+                                             imgStatusTracker* aStatusTracker,
+                                             const nsCString& aMimeType,
+                                             ImageURL* aURI,
+                                             bool aIsMultiPart,
+                                             uint32_t aInnerWindowId);
+  /**
+   * Creates a new image which isn't associated with a URI or loaded through
+   * the usual image loading mechanism.
+   *
+   * @param aMimeType      The mimetype of the image.
+   */
+  static already_AddRefed<Image> CreateAnonymousImage(const nsCString& aMimeType);
+
+private:
+  // Factory functions that create specific types of image containers.
+  static already_AddRefed<Image> CreateRasterImage(nsIRequest* aRequest,
+                                                   imgStatusTracker* aStatusTracker,
+                                                   const nsCString& aMimeType,
+                                                   ImageURL* aURI,
+                                                   uint32_t aImageFlags,
+                                                   uint32_t aInnerWindowId);
+
+  static already_AddRefed<Image> CreateVectorImage(nsIRequest* aRequest,
+                                                   imgStatusTracker* aStatusTracker,
+                                                   const nsCString& aMimeType,
+                                                   ImageURL* aURI,
+                                                   uint32_t aImageFlags,
+                                                   uint32_t aInnerWindowId);
+
+  // This is a static factory class, so disallow instantiation.
+  virtual ~ImageFactory() = 0;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // MOZILLA_IMAGELIB_IMAGEFACTORY_H_