mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 816778 Part 11: Convert SVGAngle to WebIDL r=bz
This commit is contained in:
parent
38adc80db2
commit
6e5f6082e9
@ -92,6 +92,7 @@ CPPSRCS = \
|
||||
nsSVGUseElement.cpp \
|
||||
nsSVGViewBox.cpp \
|
||||
nsSVGViewElement.cpp \
|
||||
SVGAngle.cpp \
|
||||
SVGAnimatedBoolean.cpp \
|
||||
SVGAnimatedLengthList.cpp \
|
||||
SVGAnimatedNumberList.cpp \
|
||||
@ -148,6 +149,7 @@ EXPORTS = \
|
||||
EXPORTS_NAMESPACES = mozilla/dom
|
||||
|
||||
EXPORTS_mozilla/dom = \
|
||||
SVGAngle.h \
|
||||
SVGAnimatedBoolean.h \
|
||||
$(NULL)
|
||||
|
||||
|
145
content/svg/content/src/SVGAngle.cpp
Normal file
145
content/svg/content/src/SVGAngle.cpp
Normal file
@ -0,0 +1,145 @@
|
||||
/* -*- 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/. */
|
||||
|
||||
#include "SVGAngle.h"
|
||||
#include "nsSVGAngle.h"
|
||||
#include "mozilla/dom/SVGAngleBinding.h"
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::dom;
|
||||
|
||||
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(nsISupports)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAngle)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
JSObject*
|
||||
SVGAngle::WrapObject(JSContext* aCx, JSObject* aScope, bool* aTriedToWrap)
|
||||
{
|
||||
return SVGAngleBinding::Wrap(aCx, aScope, this, aTriedToWrap);
|
||||
}
|
||||
|
||||
uint16_t
|
||||
SVGAngle::UnitType() const
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
return mVal->mAnimValUnit;
|
||||
}
|
||||
return mVal->mBaseValUnit;
|
||||
}
|
||||
|
||||
float
|
||||
SVGAngle::Value() const
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
return mVal->GetAnimValue();
|
||||
}
|
||||
return mVal->GetBaseValue();
|
||||
}
|
||||
|
||||
void
|
||||
SVGAngle::SetValue(float aValue, ErrorResult& rv)
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
rv.Throw(NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR);
|
||||
return;
|
||||
}
|
||||
bool isBaseVal = mType == BaseValue;
|
||||
mVal->SetBaseValue(aValue, isBaseVal ? mSVGElement : nullptr, isBaseVal);
|
||||
}
|
||||
|
||||
float
|
||||
SVGAngle::ValueInSpecifiedUnits() const
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
return mVal->mAnimVal;
|
||||
}
|
||||
return mVal->mBaseVal;
|
||||
}
|
||||
|
||||
void
|
||||
SVGAngle::SetValueInSpecifiedUnits(float aValue, ErrorResult& rv)
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
rv.Throw(NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR);
|
||||
return;
|
||||
} else if (mType == BaseValue) {
|
||||
mVal->SetBaseValueInSpecifiedUnits(aValue, mSVGElement);
|
||||
} else {
|
||||
mVal->mBaseVal = aValue;
|
||||
}
|
||||
}
|
||||
|
||||
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,
|
||||
ErrorResult& rv)
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
rv.Throw(NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR);
|
||||
return;
|
||||
}
|
||||
rv = mVal->NewValueSpecifiedUnits(unitType, valueInSpecifiedUnits,
|
||||
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)
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
rv.Throw(NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR);
|
||||
return;
|
||||
}
|
||||
rv = mVal->ConvertToSpecifiedUnits(unitType, mType == BaseValue ? mSVGElement : nullptr);
|
||||
}
|
||||
|
||||
void
|
||||
SVGAngle::SetValueAsString(const nsAString& aValue, ErrorResult& rv)
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
rv.Throw(NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR);
|
||||
return;
|
||||
}
|
||||
bool isBaseVal = mType == BaseValue;
|
||||
rv = mVal->SetBaseValueString(aValue, isBaseVal ? mSVGElement : nullptr, isBaseVal);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
SVGAngle::GetValueAsString(nsAString& aValue)
|
||||
{
|
||||
if (mType == AnimValue) {
|
||||
mVal->GetAnimValueString(aValue);
|
||||
} else {
|
||||
mVal->GetBaseValueString(aValue);
|
||||
}
|
||||
return NS_OK;
|
||||
}
|
||||
|
77
content/svg/content/src/SVGAngle.h
Normal file
77
content/svg/content/src/SVGAngle.h
Normal file
@ -0,0 +1,77 @@
|
||||
/* -*- 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/. */
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "nsIDOMSVGAngle.h"
|
||||
#include "nsWrapperCache.h"
|
||||
#include "nsSVGElement.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
class nsSVGAngle;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
|
||||
class SVGAngle MOZ_FINAL : public nsIDOMSVGAngle,
|
||||
public nsWrapperCache
|
||||
{
|
||||
public:
|
||||
typedef enum {
|
||||
BaseValue,
|
||||
AnimValue,
|
||||
CreatedValue
|
||||
} AngleType;
|
||||
|
||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SVGAngle)
|
||||
|
||||
SVGAngle(nsSVGAngle* aVal, nsSVGElement *aSVGElement, AngleType aType)
|
||||
: mVal(aVal), mSVGElement(aSVGElement), mType(aType)
|
||||
{
|
||||
SetIsDOMBinding();
|
||||
}
|
||||
|
||||
~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 SetValue(float aValue, ErrorResult& rv);
|
||||
float ValueInSpecifiedUnits() const;
|
||||
void SetValueInSpecifiedUnits(float aValue, ErrorResult& rv);
|
||||
void SetValueAsString(const nsAString& aValue, ErrorResult& rv);
|
||||
void NewValueSpecifiedUnits(uint16_t unitType, float value, ErrorResult& rv);
|
||||
void ConvertToSpecifiedUnits(uint16_t unitType, ErrorResult& rv);
|
||||
|
||||
protected:
|
||||
nsSVGAngle* mVal; // if mType is CreatedValue, we own the angle. Otherwise, the element does.
|
||||
nsRefPtr<nsSVGElement> mSVGElement;
|
||||
AngleType mType;
|
||||
};
|
||||
|
||||
} //namespace dom
|
||||
} //namespace mozilla
|
||||
|
@ -15,110 +15,25 @@
|
||||
#include "nsSMILValue.h"
|
||||
#include "SVGOrientSMILType.h"
|
||||
#include "nsAttrValueInlines.h"
|
||||
#include "SVGAngle.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
using namespace mozilla;
|
||||
|
||||
/**
|
||||
* Mutable SVGAngle class for SVGSVGElement.createSVGAngle().
|
||||
*
|
||||
* Note that this class holds its own nsSVGAngle, which therefore can't be
|
||||
* animated. This means SVGMarkerElement::setOrientToAngle(angle) must copy
|
||||
* any DOMSVGAngle passed in. Perhaps this is wrong and inconsistent with
|
||||
* other parts of SVG, but it's how the code works for now.
|
||||
*/
|
||||
class DOMSVGAngle MOZ_FINAL : public nsIDOMSVGAngle
|
||||
{
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
DOMSVGAngle()
|
||||
{ mVal.Init(); }
|
||||
|
||||
NS_IMETHOD GetUnitType(uint16_t* aResult)
|
||||
{ *aResult = mVal.mBaseValUnit; return NS_OK; }
|
||||
|
||||
NS_IMETHOD GetValue(float* aResult)
|
||||
{ *aResult = mVal.GetBaseValue(); return NS_OK; }
|
||||
NS_IMETHOD SetValue(float aValue)
|
||||
{
|
||||
NS_ENSURE_FINITE(aValue, NS_ERROR_ILLEGAL_VALUE);
|
||||
mVal.SetBaseValue(aValue, nullptr, false);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHOD GetValueInSpecifiedUnits(float* aResult)
|
||||
{ *aResult = mVal.mBaseVal; return NS_OK; }
|
||||
NS_IMETHOD SetValueInSpecifiedUnits(float aValue)
|
||||
{
|
||||
NS_ENSURE_FINITE(aValue, NS_ERROR_ILLEGAL_VALUE);
|
||||
mVal.mBaseVal = aValue;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHOD SetValueAsString(const nsAString& aValue)
|
||||
{ return mVal.SetBaseValueString(aValue, nullptr, false); }
|
||||
NS_IMETHOD GetValueAsString(nsAString& aValue)
|
||||
{ mVal.GetBaseValueString(aValue); return NS_OK; }
|
||||
|
||||
NS_IMETHOD NewValueSpecifiedUnits(uint16_t unitType,
|
||||
float valueInSpecifiedUnits)
|
||||
{
|
||||
return mVal.NewValueSpecifiedUnits(unitType, valueInSpecifiedUnits, nullptr);
|
||||
}
|
||||
|
||||
NS_IMETHOD ConvertToSpecifiedUnits(uint16_t unitType)
|
||||
{ return mVal.ConvertToSpecifiedUnits(unitType, nullptr); }
|
||||
|
||||
private:
|
||||
nsSVGAngle mVal;
|
||||
};
|
||||
|
||||
NS_SVG_VAL_IMPL_CYCLE_COLLECTION(nsSVGAngle::DOMBaseVal, mSVGElement)
|
||||
|
||||
NS_SVG_VAL_IMPL_CYCLE_COLLECTION(nsSVGAngle::DOMAnimVal, mSVGElement)
|
||||
using namespace mozilla::dom;
|
||||
|
||||
NS_SVG_VAL_IMPL_CYCLE_COLLECTION(nsSVGAngle::DOMAnimatedAngle, mSVGElement)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsSVGAngle::DOMBaseVal)
|
||||
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGAngle::DOMBaseVal)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsSVGAngle::DOMAnimVal)
|
||||
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGAngle::DOMAnimVal)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsSVGAngle::DOMAnimatedAngle)
|
||||
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGAngle::DOMAnimatedAngle)
|
||||
|
||||
NS_IMPL_ADDREF(DOMSVGAngle)
|
||||
NS_IMPL_RELEASE(DOMSVGAngle)
|
||||
|
||||
DOMCI_DATA(SVGAngle, nsSVGAngle::DOMBaseVal)
|
||||
DOMCI_DATA(SVGAnimatedAngle, nsSVGAngle::DOMAnimatedAngle)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGAngle::DOMBaseVal)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAngle)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGAngle::DOMAnimVal)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAngle)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGAngle::DOMAnimatedAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAnimatedAngle)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(DOMSVGAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAngle)
|
||||
NS_INTERFACE_MAP_ENTRY(nsISupports)
|
||||
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(SVGAngle)
|
||||
NS_INTERFACE_MAP_END
|
||||
|
||||
static nsIAtom** const unitMap[] =
|
||||
{
|
||||
nullptr, /* SVG_ANGLETYPE_UNKNOWN */
|
||||
@ -130,9 +45,9 @@ static nsIAtom** const unitMap[] =
|
||||
|
||||
static nsSVGAttrTearoffTable<nsSVGAngle, nsSVGAngle::DOMAnimatedAngle>
|
||||
sSVGAnimatedAngleTearoffTable;
|
||||
static nsSVGAttrTearoffTable<nsSVGAngle, nsSVGAngle::DOMBaseVal>
|
||||
static nsSVGAttrTearoffTable<nsSVGAngle, SVGAngle>
|
||||
sBaseSVGAngleTearoffTable;
|
||||
static nsSVGAttrTearoffTable<nsSVGAngle, nsSVGAngle::DOMAnimVal>
|
||||
static nsSVGAttrTearoffTable<nsSVGAngle, SVGAngle>
|
||||
sAnimSVGAngleTearoffTable;
|
||||
|
||||
/* Helper functions */
|
||||
@ -317,10 +232,10 @@ nsSVGAngle::NewValueSpecifiedUnits(uint16_t unitType,
|
||||
nsresult
|
||||
nsSVGAngle::ToDOMBaseVal(nsIDOMSVGAngle **aResult, nsSVGElement *aSVGElement)
|
||||
{
|
||||
nsRefPtr<DOMBaseVal> domBaseVal =
|
||||
nsRefPtr<SVGAngle> domBaseVal =
|
||||
sBaseSVGAngleTearoffTable.GetTearoff(this);
|
||||
if (!domBaseVal) {
|
||||
domBaseVal = new DOMBaseVal(this, aSVGElement);
|
||||
domBaseVal = new SVGAngle(this, aSVGElement, SVGAngle::BaseValue);
|
||||
sBaseSVGAngleTearoffTable.AddTearoff(this, domBaseVal);
|
||||
}
|
||||
|
||||
@ -328,18 +243,13 @@ nsSVGAngle::ToDOMBaseVal(nsIDOMSVGAngle **aResult, nsSVGElement *aSVGElement)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsSVGAngle::DOMBaseVal::~DOMBaseVal()
|
||||
{
|
||||
sBaseSVGAngleTearoffTable.RemoveTearoff(mVal);
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsSVGAngle::ToDOMAnimVal(nsIDOMSVGAngle **aResult, nsSVGElement *aSVGElement)
|
||||
{
|
||||
nsRefPtr<DOMAnimVal> domAnimVal =
|
||||
nsRefPtr<SVGAngle> domAnimVal =
|
||||
sAnimSVGAngleTearoffTable.GetTearoff(this);
|
||||
if (!domAnimVal) {
|
||||
domAnimVal = new DOMAnimVal(this, aSVGElement);
|
||||
domAnimVal = new SVGAngle(this, aSVGElement, SVGAngle::AnimValue);
|
||||
sAnimSVGAngleTearoffTable.AddTearoff(this, domAnimVal);
|
||||
}
|
||||
|
||||
@ -347,9 +257,15 @@ nsSVGAngle::ToDOMAnimVal(nsIDOMSVGAngle **aResult, nsSVGElement *aSVGElement)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsSVGAngle::DOMAnimVal::~DOMAnimVal()
|
||||
SVGAngle::~SVGAngle()
|
||||
{
|
||||
sAnimSVGAngleTearoffTable.RemoveTearoff(mVal);
|
||||
if (mType == BaseValue) {
|
||||
sBaseSVGAngleTearoffTable.RemoveTearoff(mVal);
|
||||
} else if (mType == AnimValue) {
|
||||
sAnimSVGAngleTearoffTable.RemoveTearoff(mVal);
|
||||
} else {
|
||||
delete mVal;
|
||||
}
|
||||
}
|
||||
|
||||
/* Implementation */
|
||||
@ -458,17 +374,6 @@ nsSVGAngle::DOMAnimatedAngle::~DOMAnimatedAngle()
|
||||
sSVGAnimatedAngleTearoffTable.RemoveTearoff(mVal);
|
||||
}
|
||||
|
||||
nsresult
|
||||
NS_NewDOMSVGAngle(nsIDOMSVGAngle** aResult)
|
||||
{
|
||||
*aResult = new DOMSVGAngle;
|
||||
if (!*aResult)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
NS_ADDREF(*aResult);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsISMILAttr*
|
||||
nsSVGAngle::ToSMILAttr(nsSVGElement *aSVGElement)
|
||||
{
|
||||
|
@ -13,15 +13,22 @@
|
||||
#include "nsIDOMSVGAnimatedAngle.h"
|
||||
#include "nsISMILAttr.h"
|
||||
#include "nsSVGElement.h"
|
||||
#include "nsWrapperCache.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
|
||||
class nsISMILAnimationElement;
|
||||
class nsSMILValue;
|
||||
class nsSVGOrientType;
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
class SVGAngle;
|
||||
}
|
||||
}
|
||||
|
||||
class nsSVGAngle
|
||||
{
|
||||
friend class DOMSVGAngle;
|
||||
friend class mozilla::dom::SVGAngle;
|
||||
|
||||
public:
|
||||
void Init(uint8_t aAttrEnum = 0xff,
|
||||
@ -77,84 +84,6 @@ private:
|
||||
nsresult ToDOMAnimVal(nsIDOMSVGAngle **aResult, nsSVGElement* aSVGElement);
|
||||
|
||||
public:
|
||||
struct DOMBaseVal MOZ_FINAL : public nsIDOMSVGAngle
|
||||
{
|
||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
NS_DECL_CYCLE_COLLECTION_CLASS(DOMBaseVal)
|
||||
|
||||
DOMBaseVal(nsSVGAngle* aVal, nsSVGElement *aSVGElement)
|
||||
: mVal(aVal), mSVGElement(aSVGElement) {}
|
||||
virtual ~DOMBaseVal();
|
||||
|
||||
nsSVGAngle* mVal; // kept alive because it belongs to mSVGElement
|
||||
nsRefPtr<nsSVGElement> mSVGElement;
|
||||
|
||||
NS_IMETHOD GetUnitType(uint16_t* aResult)
|
||||
{ *aResult = mVal->mBaseValUnit; return NS_OK; }
|
||||
|
||||
NS_IMETHOD GetValue(float* aResult)
|
||||
{ *aResult = mVal->GetBaseValue(); return NS_OK; }
|
||||
NS_IMETHOD SetValue(float aValue)
|
||||
{ mVal->SetBaseValue(aValue, mSVGElement, true); return NS_OK; }
|
||||
|
||||
NS_IMETHOD GetValueInSpecifiedUnits(float* aResult)
|
||||
{ *aResult = mVal->mBaseVal; return NS_OK; }
|
||||
NS_IMETHOD SetValueInSpecifiedUnits(float aValue)
|
||||
{ mVal->SetBaseValueInSpecifiedUnits(aValue, mSVGElement);
|
||||
return NS_OK; }
|
||||
|
||||
NS_IMETHOD SetValueAsString(const nsAString& aValue)
|
||||
{ return mVal->SetBaseValueString(aValue, mSVGElement, true); }
|
||||
NS_IMETHOD GetValueAsString(nsAString& aValue)
|
||||
{ mVal->GetBaseValueString(aValue); return NS_OK; }
|
||||
|
||||
NS_IMETHOD NewValueSpecifiedUnits(uint16_t unitType,
|
||||
float valueInSpecifiedUnits)
|
||||
{ return mVal->NewValueSpecifiedUnits(unitType, valueInSpecifiedUnits,
|
||||
mSVGElement); }
|
||||
|
||||
NS_IMETHOD ConvertToSpecifiedUnits(uint16_t unitType)
|
||||
{ return mVal->ConvertToSpecifiedUnits(unitType, mSVGElement); }
|
||||
};
|
||||
|
||||
struct DOMAnimVal MOZ_FINAL : public nsIDOMSVGAngle
|
||||
{
|
||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
NS_DECL_CYCLE_COLLECTION_CLASS(DOMAnimVal)
|
||||
|
||||
DOMAnimVal(nsSVGAngle* aVal, nsSVGElement *aSVGElement)
|
||||
: mVal(aVal), mSVGElement(aSVGElement) {}
|
||||
virtual ~DOMAnimVal();
|
||||
|
||||
nsSVGAngle* mVal; // kept alive because it belongs to mSVGElement
|
||||
nsRefPtr<nsSVGElement> mSVGElement;
|
||||
|
||||
NS_IMETHOD GetUnitType(uint16_t* aResult)
|
||||
{ *aResult = mVal->mAnimValUnit; return NS_OK; }
|
||||
|
||||
NS_IMETHOD GetValue(float* aResult)
|
||||
{ *aResult = mVal->GetAnimValue(); return NS_OK; }
|
||||
NS_IMETHOD SetValue(float aValue)
|
||||
{ return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
|
||||
|
||||
NS_IMETHOD GetValueInSpecifiedUnits(float* aResult)
|
||||
{ *aResult = mVal->mAnimVal; return NS_OK; }
|
||||
NS_IMETHOD SetValueInSpecifiedUnits(float aValue)
|
||||
{ return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
|
||||
|
||||
NS_IMETHOD SetValueAsString(const nsAString& aValue)
|
||||
{ return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
|
||||
NS_IMETHOD GetValueAsString(nsAString& aValue)
|
||||
{ mVal->GetAnimValueString(aValue); return NS_OK; }
|
||||
|
||||
NS_IMETHOD NewValueSpecifiedUnits(uint16_t unitType,
|
||||
float valueInSpecifiedUnits)
|
||||
{ return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
|
||||
|
||||
NS_IMETHOD ConvertToSpecifiedUnits(uint16_t unitType)
|
||||
{ return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; }
|
||||
};
|
||||
|
||||
struct DOMAnimatedAngle MOZ_FINAL : public nsIDOMSVGAnimatedAngle
|
||||
{
|
||||
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
|
||||
@ -208,7 +137,4 @@ public:
|
||||
};
|
||||
};
|
||||
|
||||
nsresult
|
||||
NS_NewDOMSVGAngle(nsIDOMSVGAngle** result);
|
||||
|
||||
#endif //__NS_SVGANGLE_H__
|
||||
|
@ -37,6 +37,7 @@
|
||||
#include "nsSMILAnimationController.h"
|
||||
#include "nsSMILTypes.h"
|
||||
#include "nsIContentIterator.h"
|
||||
#include "SVGAngle.h"
|
||||
|
||||
using namespace mozilla;
|
||||
using namespace mozilla::dom;
|
||||
@ -565,7 +566,10 @@ nsSVGSVGElement::CreateSVGLength(nsIDOMSVGLength **_retval)
|
||||
NS_IMETHODIMP
|
||||
nsSVGSVGElement::CreateSVGAngle(nsIDOMSVGAngle **_retval)
|
||||
{
|
||||
return NS_NewDOMSVGAngle(_retval);
|
||||
nsSVGAngle* angle = new nsSVGAngle();
|
||||
angle->Init();
|
||||
NS_ADDREF(*_retval = new SVGAngle(angle, this, SVGAngle::CreatedValue));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/* nsIDOMSVGPoint createSVGPoint (); */
|
||||
|
35
dom/webidl/SVGAngle.webidl
Normal file
35
dom/webidl/SVGAngle.webidl
Normal file
@ -0,0 +1,35 @@
|
||||
/* -*- 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/.
|
||||
*
|
||||
* The origin of this IDL file is
|
||||
* http://www.w3.org/TR/SVG2/
|
||||
*
|
||||
* Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
|
||||
* liability, trademark and document use rules apply.
|
||||
*/
|
||||
|
||||
interface SVGAngle {
|
||||
|
||||
// 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;
|
||||
[SetterThrows]
|
||||
attribute float value;
|
||||
[SetterThrows]
|
||||
attribute float valueInSpecifiedUnits;
|
||||
[SetterThrows]
|
||||
attribute DOMString valueAsString;
|
||||
|
||||
[Throws]
|
||||
void newValueSpecifiedUnits(unsigned short unitType, float valueInSpecifiedUnits);
|
||||
[Throws]
|
||||
void convertToSpecifiedUnits(unsigned short unitType);
|
||||
};
|
||||
|
@ -68,6 +68,7 @@ webidl_files = \
|
||||
PerformanceTiming.webidl \
|
||||
RGBColor.webidl \
|
||||
Screen.webidl \
|
||||
SVGAngle.webidl \
|
||||
SVGAnimatedBoolean.webidl \
|
||||
SVGAnimatedNumberList.webidl \
|
||||
SVGAnimatedPreserveAspectRatio.webidl \
|
||||
|
Loading…
Reference in New Issue
Block a user