wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 580902 - Remove "using namespace mozilla;" from nsSVGElement.h and fixup the places that relied on it. r=jwatt

Browse Source
This commit is contained in:
Craig Topper 2010-07-25 17:25:38 -07:00
parent 460f4d087a
commit 432b14f38e
9 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/svg/content/src/DOMSVGAnimatedLengthList.cpp
View File

@ -54,7 +54,7 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMSVGAnimatedLengthList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMSVGAnimatedLengthList)
}
DOMCI_DATA(SVGAnimatedLengthList, DOMSVGAnimatedLengthList)
DOMCI_DATA(SVGAnimatedLengthList, mozilla::DOMSVGAnimatedLengthList)
namespace mozilla {
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMSVGAnimatedLengthList)

4
content/svg/content/src/DOMSVGLength.cpp
View File

@ -67,11 +67,11 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMSVGLength)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMSVGLength)
}
DOMCI_DATA(SVGLength, DOMSVGLength)
DOMCI_DATA(SVGLength, mozilla::DOMSVGLength)
namespace mozilla {
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMSVGLength)
NS_INTERFACE_MAP_ENTRY(DOMSVGLength) // pseudo-interface
NS_INTERFACE_MAP_ENTRY(mozilla::DOMSVGLength) // pseudo-interface
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGLength)
NS_INTERFACE_MAP_ENTRY(nsISupports)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGLength)

2
content/svg/content/src/DOMSVGLengthList.cpp
View File

@ -63,7 +63,7 @@ NS_IMPL_CYCLE_COLLECTING_ADDREF(DOMSVGLengthList)
NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMSVGLengthList)
}
DOMCI_DATA(SVGLengthList, DOMSVGLengthList)
DOMCI_DATA(SVGLengthList, mozilla::DOMSVGLengthList)
namespace mozilla {
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(DOMSVGLengthList)

4
content/svg/content/src/nsSVGElement.cpp
View File

@ -97,6 +97,8 @@
#include "nsIDOMSVGTransformable.h"
#endif // MOZ_SMIL
using namespace mozilla;
// This is needed to ensure correct handling of calls to the
// vararg-list methods in this file:
// nsSVGElement::GetAnimated{Length,Number,Integer}Values
@ -2088,7 +2090,7 @@ nsSVGElement::GetAnimatedAttr(nsIAtom* aName)
// Motion (fake 'attribute' for animateMotion)
if (aName == nsGkAtoms::mozAnimateMotionDummyAttr) {
return new mozilla::SVGMotionSMILAttr(this);
return new SVGMotionSMILAttr(this);
}
// Lengths:

10
content/svg/content/src/nsSVGElement.h
View File

@ -76,8 +76,6 @@ class SVGAnimatedLengthList;
class SVGUserUnitList;
}
using namespace mozilla;
typedef nsStyledElement nsSVGElementBase;
class nsSVGElement : public nsSVGElementBase, // nsIContent
@ -182,8 +180,8 @@ public:
void GetAnimatedLengthValues(float *aFirst, ...);
void GetAnimatedNumberValues(float *aFirst, ...);
void GetAnimatedIntegerValues(PRInt32 *aFirst, ...);
void GetAnimatedLengthListValues(SVGUserUnitList *aFirst, ...);
SVGAnimatedLengthList* GetAnimatedLengthList(PRUint8 aAttrEnum);
void GetAnimatedLengthListValues(mozilla::SVGUserUnitList *aFirst, ...);
mozilla::SVGAnimatedLengthList* GetAnimatedLengthList(PRUint8 aAttrEnum);
#ifdef MOZ_SMIL
virtual nsISMILAttr* GetAnimatedAttr(nsIAtom* aName);
@ -355,11 +353,11 @@ protected:
};
struct LengthListAttributesInfo {
SVGAnimatedLengthList* mLengthLists;
mozilla::SVGAnimatedLengthList* mLengthLists;
LengthListInfo* mLengthListInfo;
PRUint32 mLengthListCount;
LengthListAttributesInfo(SVGAnimatedLengthList *aLengthLists,
LengthListAttributesInfo(mozilla::SVGAnimatedLengthList *aLengthLists,
LengthListInfo *aLengthListInfo,
PRUint32 aLengthListCount)
: mLengthLists(aLengthLists)

2
content/svg/content/src/nsSVGSVGElement.cpp
View File

@ -68,6 +68,8 @@
#include "nsSMILTypes.h"
#include "nsIContentIterator.h"
using namespace mozilla;
nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult);
#endif // MOZ_SMIL

2
content/svg/content/src/nsSVGTextPositioningElement.h
View File

@ -73,7 +73,7 @@ protected:
// nsIDOMSVGTextPositioning properties:
enum { X, Y, DX, DY };
SVGAnimatedLengthList mLengthListAttributes[4];
mozilla::SVGAnimatedLengthList mLengthListAttributes[4];
static LengthListInfo sLengthListInfo[4];
nsCOMPtr<nsIDOMSVGAnimatedNumberList> mRotate;

4
layout/svg/base/src/nsSVGGlyphFrame.h
View File

@ -149,7 +149,7 @@ public:
NS_IMETHOD_(nsSVGTextPathFrame*) FindTextPathParent();
NS_IMETHOD_(PRBool) IsStartOfChunk(); // == is new absolutely positioned chunk.
NS_IMETHOD_(void) GetXY(SVGUserUnitList *aX, SVGUserUnitList *aY);
NS_IMETHOD_(void) GetXY(mozilla::SVGUserUnitList *aX, mozilla::SVGUserUnitList *aY);
NS_IMETHOD_(PRUint16) GetTextAnchor();
NS_IMETHOD_(PRBool) IsAbsolutelyPositioned();
@ -206,7 +206,7 @@ protected:
float aMetricsScale);
gfxFloat GetBaselineOffset(float aMetricsScale);
virtual void GetDxDy(SVGUserUnitList *aDx, SVGUserUnitList *aDy);
virtual void GetDxDy(mozilla::SVGUserUnitList *aDx, mozilla::SVGUserUnitList *aDy);
already_AddRefed<nsIDOMSVGNumberList> GetRotate();
// Used to support GetBBoxContribution by making GetConvasTM use this as the

4
layout/svg/base/src/nsSVGTextPathFrame.h
View File

@ -85,8 +85,8 @@ public:
gfxFloat GetPathScale();
protected:
virtual void GetXY(SVGUserUnitList *aX, SVGUserUnitList *aY);
virtual void GetDxDy(SVGUserUnitList *aDx, SVGUserUnitList *aDy);
virtual void GetXY(mozilla::SVGUserUnitList *aX, mozilla::SVGUserUnitList *aY);
virtual void GetDxDy(mozilla::SVGUserUnitList *aDx, mozilla::SVGUserUnitList *aDy);
virtual already_AddRefed<nsIDOMSVGNumberList> GetRotate();
private: