Bug 1360511 - Move SVGDrawingParameters to a header file to allow it to be shared. r=longsonr

MozReview-Commit-ID: I1EU0AlLLHU

--HG--
extra : rebase_source : b9b76a35daf73307d3d9a62ade92c301f87f9654

image/SVGDrawingParameters.h

@@ -0,0 +1,67 @@
+/* -*- 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_image_SVGDrawingParameters_h
+#define mozilla_image_SVGDrawingParameters_h
+
+#include "gfxContext.h"
+#include "gfxTypes.h"
+#include "ImageRegion.h"
+#include "mozilla/gfx/Point.h"
+#include "mozilla/gfx/Types.h"
+#include "mozilla/Maybe.h"
+#include "nsSize.h"
+#include "SVGImageContext.h"
+
+namespace mozilla {
+namespace image {
+
+struct SVGDrawingParameters
+{
+  typedef mozilla::gfx::IntSize IntSize;
+  typedef mozilla::gfx::SamplingFilter SamplingFilter;
+
+  SVGDrawingParameters(gfxContext* aContext,
+                       const nsIntSize& aSize,
+                       const ImageRegion& aRegion,
+                       SamplingFilter aSamplingFilter,
+                       const Maybe<SVGImageContext>& aSVGContext,
+                       float aAnimationTime,
+                       uint32_t aFlags,
+                       float aOpacity)
+    : context(aContext)
+    , size(aSize.width, aSize.height)
+    , region(aRegion)
+    , samplingFilter(aSamplingFilter)
+    , svgContext(aSVGContext)
+    , viewportSize(aSize)
+    , animationTime(aAnimationTime)
+    , flags(aFlags)
+    , opacity(aOpacity)
+  {
+    if (aSVGContext) {
+      auto sz = aSVGContext->GetViewportSize();
+      if (sz) {
+        viewportSize = nsIntSize(sz->width, sz->height); // XXX losing unit
+      }
+    }
+  }
+
+  gfxContext*                   context;
+  IntSize                       size;
+  ImageRegion                   region;
+  SamplingFilter                samplingFilter;
+  const Maybe<SVGImageContext>& svgContext;
+  nsIntSize                     viewportSize;
+  float                         animationTime;
+  uint32_t                      flags;
+  gfxFloat                      opacity;
+};
+
+} // namespace image
+} // namespace mozilla
+
+#endif // mozilla_image_SVGDrawingParameters_h
+

image/VectorImage.cpp

@@ -31,6 +31,7 @@
 #include "LookupResult.h"
 #include "Orientation.h"
 #include "SVGDocumentWrapper.h"
+#include "SVGDrawingParameters.h"
 #include "nsIDOMEventListener.h"
 #include "SurfaceCache.h"
 #include "nsDocument.h"
@@ -775,45 +776,6 @@ VectorImage::GetImageContainer(LayerManager* aManager, uint32_t aFlags)
   return nullptr;
 }
 
-struct SVGDrawingParameters
-{
-  SVGDrawingParameters(gfxContext* aContext,
-                       const nsIntSize& aSize,
-                       const ImageRegion& aRegion,
-                       SamplingFilter aSamplingFilter,
-                       const Maybe<SVGImageContext>& aSVGContext,
-                       float aAnimationTime,
-                       uint32_t aFlags,
-                       float aOpacity)
-    : context(aContext)
-    , size(aSize.width, aSize.height)
-    , region(aRegion)
-    , samplingFilter(aSamplingFilter)
-    , svgContext(aSVGContext)
-    , viewportSize(aSize)
-    , animationTime(aAnimationTime)
-    , flags(aFlags)
-    , opacity(aOpacity)
-  {
-    if (aSVGContext) {
-      auto sz = aSVGContext->GetViewportSize();
-      if (sz) {
-        viewportSize = nsIntSize(sz->width, sz->height); // XXX losing unit
-      }
-    }
-  }
-
-  gfxContext*                   context;
-  IntSize                       size;
-  ImageRegion                   region;
-  SamplingFilter                samplingFilter;
-  const Maybe<SVGImageContext>& svgContext;
-  nsIntSize                     viewportSize;
-  float                         animationTime;
-  uint32_t                      flags;
-  gfxFloat                      opacity;
-};
-
 //******************************************************************************
 NS_IMETHODIMP_(DrawResult)
 VectorImage::Draw(gfxContext* aContext,