From 6479311100c01568c3359bcfeb2842013f65223a Mon Sep 17 00:00:00 2001
From: Jonathan Watt <jwatt@jwatt.org>
Date: Tue, 29 Mar 2016 00:37:15 +0100
Subject: [PATCH] Bug 1263789 - Stop nsSVGMaskFrameNEON.h from polluting the
 global namespace. r=dholbert

---
 layout/svg/nsSVGMaskFrameNEON.cpp | 2 ++
 layout/svg/nsSVGMaskFrameNEON.h   | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layout/svg/nsSVGMaskFrameNEON.cpp b/layout/svg/nsSVGMaskFrameNEON.cpp
index ed324609b814..f690b8164dea 100644
--- a/layout/svg/nsSVGMaskFrameNEON.cpp
+++ b/layout/svg/nsSVGMaskFrameNEON.cpp
@@ -7,6 +7,8 @@
 #include "nsSVGMaskFrame.h"
 #include <arm_neon.h>
 
+using namespace mozilla::gfx;
+
 void
 ComputesRGBLuminanceMask_NEON(const uint8_t *aSourceData,
                               int32_t aSourceStride,
diff --git a/layout/svg/nsSVGMaskFrameNEON.h b/layout/svg/nsSVGMaskFrameNEON.h
index 29dc9fab0359..1da901ba7f41 100644
--- a/layout/svg/nsSVGMaskFrameNEON.h
+++ b/layout/svg/nsSVGMaskFrameNEON.h
@@ -6,16 +6,14 @@
 #ifndef __NS_SVGMASKFRAMENEON_H__
 #define __NS_SVGMASKFRAMENEON_H__
 
-#include "mozilla/gfx/2D.h"
-
-using namespace mozilla::gfx;
+#include "mozilla/gfx/Point.h"
 
 void
 ComputesRGBLuminanceMask_NEON(const uint8_t *aSourceData,
                               int32_t aSourceStride,
                               uint8_t *aDestData,
                               int32_t aDestStride,
-                              const IntSize &aSize,
+                              const mozilla::gfx::IntSize &aSize,
                               float aOpacity);
 
 #endif /* __NS_SVGMASKFRAMENEON_H__ */