mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
Bug 817442 Part 5: Remove nsIDOMSVG(Animated)Angle r=bz
This commit is contained in:
parent
8cf6725873
commit
3879a4e943
@ -15,13 +15,10 @@ NS_SVG_VAL_IMPL_CYCLE_COLLECTION_WRAPPERCACHED(SVGAngle, mSVGElement)
|
||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(SVGAngle)
|
||||
NS_IMPL_CYCLE_COLLECTING_RELEASE(SVGAngle)
|
||||
|
||||
DOMCI_DATA(SVGAngle, SVGAngle)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SVGAngle)
|
||||
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(SVGAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAngle)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
JSObject*
|
||||
@ -81,15 +78,6 @@ SVGAngle::SetValueInSpecifiedUnits(float aValue, ErrorResult& rv)
|
||||
}
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
SVGAngle::NewValueSpecifiedUnits(uint16_t unitType,
|
||||
float valueInSpecifiedUnits)
|
||||
{
|
||||
ErrorResult rv;
|
||||
NewValueSpecifiedUnits(unitType, valueInSpecifiedUnits, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
|
||||
void
|
||||
SVGAngle::NewValueSpecifiedUnits(uint16_t unitType,
|
||||
float valueInSpecifiedUnits,
|
||||
@ -103,14 +91,6 @@ SVGAngle::NewValueSpecifiedUnits(uint16_t unitType,
|
||||
mType == BaseValue ? mSVGElement : nullptr);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
SVGAngle::ConvertToSpecifiedUnits(uint16_t unitType)
|
||||
{
|
||||
ErrorResult rv;
|
||||
ConvertToSpecifiedUnits(unitType, rv);
|
||||
return rv.ErrorCode();
|
||||
}
|
||||
|
||||
void
|
||||
SVGAngle::ConvertToSpecifiedUnits(uint16_t unitType, ErrorResult& rv)
|
||||
{
|
||||
@ -132,7 +112,7 @@ SVGAngle::SetValueAsString(const nsAString& aValue, ErrorResult& rv)
|
||||
rv = mVal->SetBaseValueString(aValue, isBaseVal ? mSVGElement : nullptr, isBaseVal);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
void
|
||||
SVGAngle::GetValueAsString(nsAString& aValue)
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
@ -140,6 +120,5 @@ SVGAngle::GetValueAsString(nsAString& aValue)
|
||||
} else {
|
||||
mVal->GetBaseValueString(aValue);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -5,17 +5,26 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "nsIDOMSVGAngle.h"
|
||||
#include "nsWrapperCache.h"
|
||||
#include "nsSVGElement.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
class nsSVGAngle;
|
||||
|
||||
// We make SVGAngle a pseudo-interface to allow us to QI to it in order
|
||||
// to check that the objects that scripts pass in are our our *native*
|
||||
// transform objects.
|
||||
|
||||
// {da9670f6-6d3d-4fb3-974c-9d6bad8dcd53}
|
||||
#define MOZILLA_SVGANGLE_IID \
|
||||
{0x2cd27ef5, 0x81d8, 0x4720, \
|
||||
{0x81, 0x42, 0x66, 0xc6, 0xa9, 0xbe, 0xc3, 0xeb } }
|
||||
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
class SVGAngle MOZ_FINAL : public nsIDOMSVGAngle,
|
||||
class SVGAngle MOZ_FINAL : public nsISupports,
|
||||
public nsWrapperCache
|
||||
{
|
||||
public:
|
||||
@ -25,6 +34,7 @@ public:
|
||||
CreatedValue
|
||||
} AngleType;
|
||||
|
||||
NS_DECLARE_STATIC_IID_ACCESSOR(MOZILLA_SVGANGLE_IID)
|
||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SVGAngle)
|
||||
|
||||
@ -36,29 +46,12 @@ public:
|
||||
|
||||
~SVGAngle();
|
||||
|
||||
NS_IMETHOD GetUnitType(uint16_t* aResult)
|
||||
{ *aResult = UnitType(); return NS_OK; }
|
||||
|
||||
NS_IMETHOD GetValue(float* aResult)
|
||||
{ *aResult = Value(); return NS_OK; }
|
||||
NS_IMETHOD SetValue(float aValue)
|
||||
{ ErrorResult rv; SetValue(aValue, rv); return rv.ErrorCode(); }
|
||||
NS_IMETHOD GetValueInSpecifiedUnits(float* aResult)
|
||||
{ *aResult = ValueInSpecifiedUnits(); return NS_OK; }
|
||||
NS_IMETHOD SetValueInSpecifiedUnits(float aValue)
|
||||
{ ErrorResult rv; SetValueInSpecifiedUnits(aValue, rv); return rv.ErrorCode(); }
|
||||
NS_IMETHOD SetValueAsString(const nsAString& aValue)
|
||||
{ ErrorResult rv; SetValueAsString(aValue, rv); return rv.ErrorCode(); }
|
||||
NS_IMETHOD GetValueAsString(nsAString& aValue);
|
||||
NS_IMETHOD NewValueSpecifiedUnits(uint16_t unitType,
|
||||
float valueInSpecifiedUnits);
|
||||
NS_IMETHOD ConvertToSpecifiedUnits(uint16_t unitType);
|
||||
|
||||
// WebIDL
|
||||
nsSVGElement* GetParentObject() { return mSVGElement; }
|
||||
virtual JSObject* WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap);
|
||||
uint16_t UnitType() const;
|
||||
float Value() const;
|
||||
void GetValueAsString(nsAString& aValue);
|
||||
void SetValue(float aValue, ErrorResult& rv);
|
||||
float ValueInSpecifiedUnits() const;
|
||||
void SetValueInSpecifiedUnits(float aValue, ErrorResult& rv);
|
||||
@ -72,6 +65,8 @@ protected:
|
||||
AngleType mType;
|
||||
};
|
||||
|
||||
NS_DEFINE_STATIC_IID_ACCESSOR(SVGAngle, MOZILLA_SVGANGLE_IID)
|
||||
|
||||
} //namespace dom
|
||||
} //namespace mozilla
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "SVGAnimatedAngle.h"
|
||||
#include "SVGAngle.h"
|
||||
#include "nsSVGAngle.h"
|
||||
#include "mozilla/dom/SVGAnimatedAngleBinding.h"
|
||||
|
||||
@ -15,13 +16,9 @@ NS_SVG_VAL_IMPL_CYCLE_COLLECTION_WRAPPERCACHED(SVGAnimatedAngle, mSVGElement)
|
||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(SVGAnimatedAngle)
|
||||
NS_IMPL_CYCLE_COLLECTING_RELEASE(SVGAnimatedAngle)
|
||||
|
||||
DOMCI_DATA(SVGAnimatedAngle, SVGAnimatedAngle)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(SVGAnimatedAngle)
|
||||
NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedAngle)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
JSObject*
|
||||
|
@ -5,7 +5,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "nsIDOMSVGAnimatedAngle.h"
|
||||
#include "nsWrapperCache.h"
|
||||
#include "nsSVGElement.h"
|
||||
#include "SVGAngle.h"
|
||||
@ -16,7 +15,7 @@ class nsSVGAngle;
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
class SVGAnimatedAngle MOZ_FINAL : public nsIDOMSVGAnimatedAngle,
|
||||
class SVGAnimatedAngle MOZ_FINAL : public nsISupports,
|
||||
public nsWrapperCache
|
||||
{
|
||||
public:
|
||||
@ -30,10 +29,10 @@ public:
|
||||
}
|
||||
~SVGAnimatedAngle();
|
||||
|
||||
NS_IMETHOD GetBaseVal(nsIDOMSVGAngle **aBaseVal)
|
||||
NS_IMETHOD GetBaseVal(nsISupports **aBaseVal)
|
||||
{ *aBaseVal = BaseVal().get(); return NS_OK; }
|
||||
|
||||
NS_IMETHOD GetAnimVal(nsIDOMSVGAngle **aAnimVal)
|
||||
NS_IMETHOD GetAnimVal(nsISupports **aAnimVal)
|
||||
{ *aAnimVal = AnimVal().get(); return NS_OK; }
|
||||
|
||||
// WebIDL
|
||||
|
@ -450,9 +450,9 @@ SVGMotionSMILAnimationFunction::SetRotate(const nsAString& aRotate,
|
||||
|
||||
// Convert to radian units, if we're not already in radians.
|
||||
uint8_t angleUnit = svgAngle.GetBaseValueUnit();
|
||||
if (angleUnit != nsIDOMSVGAngle::SVG_ANGLETYPE_RAD) {
|
||||
if (angleUnit != SVG_ANGLETYPE_RAD) {
|
||||
mRotateAngle *= nsSVGAngle::GetDegreesPerUnit(angleUnit) /
|
||||
nsSVGAngle::GetDegreesPerUnit(nsIDOMSVGAngle::SVG_ANGLETYPE_RAD);
|
||||
nsSVGAngle::GetDegreesPerUnit(SVG_ANGLETYPE_RAD);
|
||||
}
|
||||
}
|
||||
return NS_OK;
|
||||
|
@ -8,8 +8,6 @@
|
||||
#include "SVGMotionSMILType.h"
|
||||
#include "nsSMILValue.h"
|
||||
#include "nsDebug.h"
|
||||
#include "nsSVGAngle.h"
|
||||
#include "nsIDOMSVGAngle.h"
|
||||
#include "nsSVGPathElement.h"
|
||||
#include "nsMathUtils.h"
|
||||
#include <math.h>
|
||||
|
@ -21,7 +21,7 @@ SVGOrientSMILType::Init(nsSMILValue& aValue) const
|
||||
NS_ABORT_IF_FALSE(aValue.IsNull(), "Unexpected value type");
|
||||
|
||||
aValue.mU.mOrient.mAngle = 0.0f;
|
||||
aValue.mU.mOrient.mUnit = nsIDOMSVGAngle::SVG_ANGLETYPE_UNSPECIFIED;
|
||||
aValue.mU.mOrient.mUnit = SVG_ANGLETYPE_UNSPECIFIED;
|
||||
aValue.mU.mOrient.mOrientType = nsIDOMSVGMarkerElement::SVG_MARKER_ORIENT_ANGLE;
|
||||
aValue.mType = this;
|
||||
}
|
||||
|
@ -43,8 +43,8 @@ static nsSVGAttrTearoffTable<nsSVGAngle, SVGAngle>
|
||||
static bool
|
||||
IsValidUnitType(uint16_t unit)
|
||||
{
|
||||
if (unit > nsIDOMSVGAngle::SVG_ANGLETYPE_UNKNOWN &&
|
||||
unit <= nsIDOMSVGAngle::SVG_ANGLETYPE_GRAD)
|
||||
if (unit > SVG_ANGLETYPE_UNKNOWN &&
|
||||
unit <= SVG_ANGLETYPE_GRAD)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
@ -68,7 +68,7 @@ static uint16_t
|
||||
GetUnitTypeForString(const nsAString& unitStr)
|
||||
{
|
||||
if (unitStr.IsEmpty())
|
||||
return nsIDOMSVGAngle::SVG_ANGLETYPE_UNSPECIFIED;
|
||||
return SVG_ANGLETYPE_UNSPECIFIED;
|
||||
|
||||
nsIAtom *unitAtom = NS_GetStaticAtom(unitStr);
|
||||
|
||||
@ -80,7 +80,7 @@ GetUnitTypeForString(const nsAString& unitStr)
|
||||
}
|
||||
}
|
||||
|
||||
return nsIDOMSVGAngle::SVG_ANGLETYPE_UNKNOWN;
|
||||
return SVG_ANGLETYPE_UNKNOWN;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -125,12 +125,12 @@ GetValueFromString(const nsAString &aValueAsString,
|
||||
nsSVGAngle::GetDegreesPerUnit(uint8_t aUnit)
|
||||
{
|
||||
switch (aUnit) {
|
||||
case nsIDOMSVGAngle::SVG_ANGLETYPE_UNSPECIFIED:
|
||||
case nsIDOMSVGAngle::SVG_ANGLETYPE_DEG:
|
||||
case SVG_ANGLETYPE_UNSPECIFIED:
|
||||
case SVG_ANGLETYPE_DEG:
|
||||
return 1;
|
||||
case nsIDOMSVGAngle::SVG_ANGLETYPE_RAD:
|
||||
case SVG_ANGLETYPE_RAD:
|
||||
return static_cast<float>(180.0 / M_PI);
|
||||
case nsIDOMSVGAngle::SVG_ANGLETYPE_GRAD:
|
||||
case SVG_ANGLETYPE_GRAD:
|
||||
return 90.0f / 100.0f;
|
||||
default:
|
||||
NS_NOTREACHED("Unknown unit type");
|
||||
@ -343,7 +343,7 @@ nsSVGAngle::SetAnimValue(float aValue, uint8_t aUnit, nsSVGElement *aSVGElement)
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsSVGAngle::ToDOMAnimatedAngle(nsIDOMSVGAnimatedAngle **aResult,
|
||||
nsSVGAngle::ToDOMAnimatedAngle(nsISupports **aResult,
|
||||
nsSVGElement *aSVGElement)
|
||||
{
|
||||
nsRefPtr<SVGAnimatedAngle> domAnimatedAngle =
|
||||
@ -432,7 +432,7 @@ nsSVGAngle::SMILOrient::SetAnimValue(const nsSMILValue& aValue)
|
||||
if (aValue.mType == &SVGOrientSMILType::sSingleton) {
|
||||
mOrientType->SetAnimValue(aValue.mU.mOrient.mOrientType);
|
||||
if (aValue.mU.mOrient.mOrientType == nsIDOMSVGMarkerElement::SVG_MARKER_ORIENT_AUTO) {
|
||||
mAngle->SetAnimValue(0.0f, nsIDOMSVGAngle::SVG_ANGLETYPE_UNSPECIFIED, mSVGElement);
|
||||
mAngle->SetAnimValue(0.0f, SVG_ANGLETYPE_UNSPECIFIED, mSVGElement);
|
||||
} else {
|
||||
mAngle->SetAnimValue(aValue.mU.mOrient.mAngle, aValue.mU.mOrient.mUnit, mSVGElement);
|
||||
}
|
||||
|
@ -9,8 +9,6 @@
|
||||
#include "nsAutoPtr.h"
|
||||
#include "nsCycleCollectionParticipant.h"
|
||||
#include "nsError.h"
|
||||
#include "nsIDOMSVGAngle.h"
|
||||
#include "nsIDOMSVGAnimatedAngle.h"
|
||||
#include "nsISMILAttr.h"
|
||||
#include "nsSVGElement.h"
|
||||
#include "nsWrapperCache.h"
|
||||
@ -21,6 +19,14 @@ class nsSMILValue;
|
||||
class nsSVGOrientType;
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
// Angle Unit Types
|
||||
static const unsigned short SVG_ANGLETYPE_UNKNOWN = 0;
|
||||
static const unsigned short SVG_ANGLETYPE_UNSPECIFIED = 1;
|
||||
static const unsigned short SVG_ANGLETYPE_DEG = 2;
|
||||
static const unsigned short SVG_ANGLETYPE_RAD = 3;
|
||||
static const unsigned short SVG_ANGLETYPE_GRAD = 4;
|
||||
|
||||
namespace dom {
|
||||
class SVGAngle;
|
||||
class SVGAnimatedAngle;
|
||||
@ -35,7 +41,7 @@ class nsSVGAngle
|
||||
public:
|
||||
void Init(uint8_t aAttrEnum = 0xff,
|
||||
float aValue = 0,
|
||||
uint8_t aUnitType = nsIDOMSVGAngle::SVG_ANGLETYPE_UNSPECIFIED) {
|
||||
uint8_t aUnitType = mozilla::SVG_ANGLETYPE_UNSPECIFIED) {
|
||||
mAnimVal = mBaseVal = aValue;
|
||||
mAnimValUnit = mBaseValUnit = aUnitType;
|
||||
mAttrEnum = aAttrEnum;
|
||||
@ -61,8 +67,8 @@ public:
|
||||
float GetBaseValInSpecifiedUnits() const { return mBaseVal; }
|
||||
float GetAnimValInSpecifiedUnits() const { return mAnimVal; }
|
||||
|
||||
static nsresult ToDOMSVGAngle(nsIDOMSVGAngle **aResult);
|
||||
nsresult ToDOMAnimatedAngle(nsIDOMSVGAnimatedAngle **aResult,
|
||||
static nsresult ToDOMSVGAngle(nsISupports **aResult);
|
||||
nsresult ToDOMAnimatedAngle(nsISupports **aResult,
|
||||
nsSVGElement* aSVGElement);
|
||||
// Returns a new nsISMILAttr object that the caller must delete
|
||||
nsISMILAttr* ToSMILAttr(nsSVGElement* aSVGElement);
|
||||
|
@ -13,6 +13,7 @@
|
||||
#include "gfxMatrix.h"
|
||||
#include "nsContentUtils.h" // NS_ENSURE_FINITE
|
||||
#include "SVGContentUtils.h"
|
||||
#include "SVGAngle.h"
|
||||
|
||||
using namespace mozilla;
|
||||
|
||||
@ -40,7 +41,7 @@ nsSVGElement::EnumInfo nsSVGMarkerElement::sEnumInfo[1] =
|
||||
|
||||
nsSVGElement::AngleInfo nsSVGMarkerElement::sAngleInfo[1] =
|
||||
{
|
||||
{ &nsGkAtoms::orient, 0, nsIDOMSVGAngle::SVG_ANGLETYPE_UNSPECIFIED }
|
||||
{ &nsGkAtoms::orient, 0, SVG_ANGLETYPE_UNSPECIFIED }
|
||||
};
|
||||
|
||||
NS_IMPL_NS_NEW_SVG_ELEMENT(Marker)
|
||||
@ -169,8 +170,8 @@ NS_IMETHODIMP nsSVGMarkerElement::GetOrientType(nsIDOMSVGAnimatedEnumeration * *
|
||||
return mOrientType.ToDOMAnimatedEnum(aOrientType, this);
|
||||
}
|
||||
|
||||
/* readonly attribute nsIDOMSVGAnimatedLength orientAngle; */
|
||||
NS_IMETHODIMP nsSVGMarkerElement::GetOrientAngle(nsIDOMSVGAnimatedAngle * *aOrientAngle)
|
||||
/* readonly attribute SVGAnimatedAngle orientAngle; */
|
||||
NS_IMETHODIMP nsSVGMarkerElement::GetOrientAngle(nsISupports * *aOrientAngle)
|
||||
{
|
||||
return mAngleAttributes[ORIENT].ToDOMAnimatedAngle(aOrientAngle, this);
|
||||
}
|
||||
@ -183,15 +184,14 @@ NS_IMETHODIMP nsSVGMarkerElement::SetOrientToAuto()
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/* void setOrientToAngle (in nsIDOMSVGAngle angle); */
|
||||
NS_IMETHODIMP nsSVGMarkerElement::SetOrientToAngle(nsIDOMSVGAngle *angle)
|
||||
/* void setOrientToAngle (in SVGAngle angle); */
|
||||
NS_IMETHODIMP nsSVGMarkerElement::SetOrientToAngle(nsISupports *aAngle)
|
||||
{
|
||||
nsCOMPtr<dom::SVGAngle> angle = do_QueryInterface(aAngle);
|
||||
if (!angle)
|
||||
return NS_ERROR_DOM_SVG_WRONG_TYPE_ERR;
|
||||
|
||||
float f;
|
||||
nsresult rv = angle->GetValue(&f);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
float f = angle->Value();
|
||||
NS_ENSURE_FINITE(f, NS_ERROR_DOM_SVG_WRONG_TYPE_ERR);
|
||||
mAngleAttributes[ORIENT].SetBaseValue(f, this, true);
|
||||
|
||||
|
@ -562,9 +562,9 @@ nsSVGSVGElement::CreateSVGLength(nsIDOMSVGLength **_retval)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/* nsIDOMSVGAngle createSVGAngle (); */
|
||||
/* SVGAngle createSVGAngle (); */
|
||||
NS_IMETHODIMP
|
||||
nsSVGSVGElement::CreateSVGAngle(nsIDOMSVGAngle **_retval)
|
||||
nsSVGSVGElement::CreateSVGAngle(nsISupports **_retval)
|
||||
{
|
||||
nsSVGAngle* angle = new nsSVGAngle();
|
||||
angle->Init();
|
||||
|
@ -312,8 +312,6 @@
|
||||
#include "nsIDOMGetSVGDocument.h"
|
||||
#include "nsIDOMSVGAElement.h"
|
||||
#include "nsIDOMSVGAltGlyphElement.h"
|
||||
#include "nsIDOMSVGAngle.h"
|
||||
#include "nsIDOMSVGAnimatedAngle.h"
|
||||
#include "nsIDOMSVGAnimatedEnum.h"
|
||||
#include "nsIDOMSVGAnimatedInteger.h"
|
||||
#include "nsIDOMSVGAnimatedLength.h"
|
||||
@ -1222,10 +1220,6 @@ static nsDOMClassInfoData sClassInfoData[] = {
|
||||
ELEMENT_SCRIPTABLE_FLAGS)
|
||||
|
||||
// other SVG classes
|
||||
NS_DEFINE_CLASSINFO_DATA(SVGAngle, nsDOMGenericSH,
|
||||
DOM_DEFAULT_SCRIPTABLE_FLAGS)
|
||||
NS_DEFINE_CLASSINFO_DATA(SVGAnimatedAngle, nsDOMGenericSH,
|
||||
DOM_DEFAULT_SCRIPTABLE_FLAGS)
|
||||
NS_DEFINE_CLASSINFO_DATA(SVGAnimatedEnumeration, nsDOMGenericSH,
|
||||
DOM_DEFAULT_SCRIPTABLE_FLAGS)
|
||||
NS_DEFINE_CLASSINFO_DATA(SVGAnimatedInteger, nsDOMGenericSH,
|
||||
@ -3495,15 +3489,6 @@ nsDOMClassInfo::Init()
|
||||
DOM_CLASSINFO_MAP_END
|
||||
|
||||
// other SVG classes
|
||||
|
||||
DOM_CLASSINFO_MAP_BEGIN(SVGAngle, nsIDOMSVGAngle)
|
||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAngle)
|
||||
DOM_CLASSINFO_MAP_END
|
||||
|
||||
DOM_CLASSINFO_MAP_BEGIN(SVGAnimatedAngle, nsIDOMSVGAnimatedAngle)
|
||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimatedAngle)
|
||||
DOM_CLASSINFO_MAP_END
|
||||
|
||||
DOM_CLASSINFO_MAP_BEGIN(SVGAnimatedEnumeration, nsIDOMSVGAnimatedEnumeration)
|
||||
DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimatedEnumeration)
|
||||
DOM_CLASSINFO_MAP_END
|
||||
|
@ -255,8 +255,6 @@ DOMCI_CLASS(SVGUseElement)
|
||||
DOMCI_CLASS(SVGViewElement)
|
||||
|
||||
// other SVG classes
|
||||
DOMCI_CLASS(SVGAngle)
|
||||
DOMCI_CLASS(SVGAnimatedAngle)
|
||||
DOMCI_CLASS(SVGAnimatedEnumeration)
|
||||
DOMCI_CLASS(SVGAnimatedInteger)
|
||||
DOMCI_CLASS(SVGAnimatedLength)
|
||||
|
@ -19,8 +19,6 @@ XPIDLSRCS = \
|
||||
nsIDOMGetSVGDocument.idl \
|
||||
nsIDOMSVGAElement.idl \
|
||||
nsIDOMSVGAltGlyphElement.idl \
|
||||
nsIDOMSVGAngle.idl \
|
||||
nsIDOMSVGAnimatedAngle.idl \
|
||||
nsIDOMSVGAnimatedEnum.idl \
|
||||
nsIDOMSVGAnimatedInteger.idl \
|
||||
nsIDOMSVGAnimatedLength.idl \
|
||||
|
@ -1,37 +0,0 @@
|
||||
/* -*- Mode: IDL; 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/. */
|
||||
|
||||
#include "domstubs.idl"
|
||||
|
||||
/**
|
||||
* The nsIDOMSVGAngle interface is the interface to an SVG angle.
|
||||
*
|
||||
* For more information on this interface please see
|
||||
* http://www.w3.org/TR/SVG11/types.html#InterfaceSVGAngle
|
||||
*
|
||||
*/
|
||||
|
||||
[scriptable, uuid(58b6190e-37b3-412a-ba02-1d5ad6c6ea7c)]
|
||||
interface nsIDOMSVGAngle : nsISupports
|
||||
{
|
||||
// Angle Unit Types
|
||||
const unsigned short SVG_ANGLETYPE_UNKNOWN = 0;
|
||||
const unsigned short SVG_ANGLETYPE_UNSPECIFIED = 1;
|
||||
const unsigned short SVG_ANGLETYPE_DEG = 2;
|
||||
const unsigned short SVG_ANGLETYPE_RAD = 3;
|
||||
const unsigned short SVG_ANGLETYPE_GRAD = 4;
|
||||
|
||||
readonly attribute unsigned short unitType;
|
||||
attribute float value;
|
||||
// raises DOMException on setting
|
||||
attribute float valueInSpecifiedUnits;
|
||||
// raises DOMException on setting
|
||||
attribute DOMString valueAsString;
|
||||
// raises DOMException on setting
|
||||
|
||||
void newValueSpecifiedUnits(in unsigned short unitType, in float valueInSpecifiedUnits);
|
||||
void convertToSpecifiedUnits(in unsigned short unitType);
|
||||
};
|
||||
|
@ -1,24 +0,0 @@
|
||||
/* -*- Mode: IDL; 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/. */
|
||||
|
||||
#include "domstubs.idl"
|
||||
|
||||
interface nsIDOMSVGAngle;
|
||||
|
||||
/**
|
||||
* The nsIDOMSVGAnimatedAngle interface is the interface to an SVG
|
||||
* animated angle.
|
||||
*
|
||||
* For more information on this interface please see
|
||||
* http://www.w3.org/TR/SVG11/types.html#InterfaceSVGAnimatedAngle
|
||||
*
|
||||
*/
|
||||
|
||||
[scriptable, uuid(c6ab8b9e-32db-464a-ae33-8691d44bc60a)]
|
||||
interface nsIDOMSVGAnimatedAngle : nsISupports
|
||||
{
|
||||
readonly attribute nsIDOMSVGAngle baseVal;
|
||||
readonly attribute nsIDOMSVGAngle animVal;
|
||||
};
|
@ -7,8 +7,6 @@
|
||||
|
||||
interface nsIDOMSVGAnimatedLength;
|
||||
interface nsIDOMSVGAnimatedEnumeration;
|
||||
interface nsIDOMSVGAngle;
|
||||
interface nsIDOMSVGAnimatedAngle;
|
||||
interface nsIDOMSVGAnimatedRect;
|
||||
interface nsIDOMSVGMatrix;
|
||||
|
||||
@ -52,8 +50,8 @@ interface nsIDOMSVGMarkerElement
|
||||
readonly attribute nsIDOMSVGAnimatedLength markerWidth;
|
||||
readonly attribute nsIDOMSVGAnimatedLength markerHeight;
|
||||
readonly attribute nsIDOMSVGAnimatedEnumeration orientType;
|
||||
readonly attribute nsIDOMSVGAnimatedAngle orientAngle;
|
||||
readonly attribute nsISupports orientAngle;
|
||||
|
||||
void setOrientToAuto ( );
|
||||
void setOrientToAngle ( in nsIDOMSVGAngle angle );
|
||||
void setOrientToAngle ( in nsISupports angle );
|
||||
};
|
||||
|
@ -11,7 +11,6 @@ interface nsIDOMSVGViewSpec;
|
||||
interface nsIDOMSVGPoint;
|
||||
interface nsIDOMSVGNumber;
|
||||
interface nsIDOMSVGLength;
|
||||
interface nsIDOMSVGAngle;
|
||||
interface nsIDOMSVGMatrix;
|
||||
interface nsIDOMSVGTransform;
|
||||
|
||||
@ -76,7 +75,8 @@ interface nsIDOMSVGSVGElement
|
||||
void deSelectAll();
|
||||
nsIDOMSVGNumber createSVGNumber();
|
||||
nsIDOMSVGLength createSVGLength();
|
||||
nsIDOMSVGAngle createSVGAngle();
|
||||
// SVGAngle
|
||||
nsISupports createSVGAngle();
|
||||
nsIDOMSVGPoint createSVGPoint();
|
||||
nsIDOMSVGMatrix createSVGMatrix();
|
||||
nsIDOMSVGRect createSVGRect();
|
||||
|
Loading…
Reference in New Issue
Block a user