Bug 1263789 - Stop nsSVGMaskFrameNEON.h from polluting the global namespace. r=dholbert
authorJonathan Watt <jwatt@jwatt.org>
Tue, 29 Mar 2016 00:37:15 +0100
changeset 330677 f1631a25825bc0da92bbc8dcca350bcd893edfe0
parent 330676 774962b54f183a2952cdd22d5a9e185f247d211f
child 330678 cb2b8b7bc47f92d51420a1c942042d27a9c9ae39
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdholbert
bugs1263789
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1263789 - Stop nsSVGMaskFrameNEON.h from polluting the global namespace. r=dholbert
layout/svg/nsSVGMaskFrameNEON.cpp
layout/svg/nsSVGMaskFrameNEON.h
--- a/layout/svg/nsSVGMaskFrameNEON.cpp
+++ b/layout/svg/nsSVGMaskFrameNEON.cpp
@@ -2,16 +2,18 @@
 /* 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 "nsSVGMaskFrameNEON.h"
 #include "nsSVGMaskFrame.h"
 #include <arm_neon.h>
 
+using namespace mozilla::gfx;
+
 void
 ComputesRGBLuminanceMask_NEON(const uint8_t *aSourceData,
                               int32_t aSourceStride,
                               uint8_t *aDestData,
                               int32_t aDestStride,
                               const IntSize &aSize,
                               float aOpacity)
 {
--- a/layout/svg/nsSVGMaskFrameNEON.h
+++ b/layout/svg/nsSVGMaskFrameNEON.h
@@ -1,21 +1,19 @@
 /* -*- 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 __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__ */