зеркало из https://github.com/mozilla/pjs.git
Bug 615872 Part 1 - SVG SMIL: Remove unneeded mTimedDocumentRoot member from nsSVGAnimationElement; r=dholbert; a=roc
This commit is contained in:
Родитель
b1b26cc160
Коммит
c171b51326
|
@ -82,8 +82,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
||||||
#endif
|
#endif
|
||||||
nsSVGAnimationElement::nsSVGAnimationElement(already_AddRefed<nsINodeInfo> aNodeInfo)
|
nsSVGAnimationElement::nsSVGAnimationElement(already_AddRefed<nsINodeInfo> aNodeInfo)
|
||||||
: nsSVGAnimationElementBase(aNodeInfo),
|
: nsSVGAnimationElementBase(aNodeInfo),
|
||||||
mHrefTarget(this),
|
mHrefTarget(this)
|
||||||
mTimedDocumentRoot(nsnull)
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma warning(pop)
|
#pragma warning(pop)
|
||||||
#endif
|
#endif
|
||||||
|
@ -282,13 +281,6 @@ nsSVGAnimationElement::BindToTree(nsIDocument* aDocument,
|
||||||
// piece by piece via script)
|
// piece by piece via script)
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
||||||
mTimedDocumentRoot = GetTimeContainer();
|
|
||||||
if (!mTimedDocumentRoot)
|
|
||||||
// Timed document root hasn't been created yet. This will be created when
|
|
||||||
// the SVG parent is bound. This happens when we create SVG trees entirely
|
|
||||||
// by script.
|
|
||||||
return NS_OK;
|
|
||||||
|
|
||||||
// Add myself to the animation controller's master set of animation elements.
|
// Add myself to the animation controller's master set of animation elements.
|
||||||
if (aDocument) {
|
if (aDocument) {
|
||||||
nsSMILAnimationController *controller = aDocument->GetAnimationController();
|
nsSMILAnimationController *controller = aDocument->GetAnimationController();
|
||||||
|
@ -326,10 +318,6 @@ nsSVGAnimationElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mTimedDocumentRoot) {
|
|
||||||
mTimedDocumentRoot = nsnull;
|
|
||||||
}
|
|
||||||
|
|
||||||
mHrefTarget.Unlink();
|
mHrefTarget.Unlink();
|
||||||
mTimedElement.DissolveReferences();
|
mTimedElement.DissolveReferences();
|
||||||
|
|
||||||
|
|
|
@ -47,8 +47,6 @@
|
||||||
#include "nsISMILAnimationElement.h"
|
#include "nsISMILAnimationElement.h"
|
||||||
#include "nsSMILTimedElement.h"
|
#include "nsSMILTimedElement.h"
|
||||||
|
|
||||||
class nsSMILTimeContainer;
|
|
||||||
|
|
||||||
typedef nsSVGElement nsSVGAnimationElementBase;
|
typedef nsSVGElement nsSVGAnimationElementBase;
|
||||||
|
|
||||||
class nsSVGAnimationElement : public nsSVGAnimationElementBase,
|
class nsSVGAnimationElement : public nsSVGAnimationElementBase,
|
||||||
|
@ -130,7 +128,6 @@ protected:
|
||||||
|
|
||||||
TargetReference mHrefTarget;
|
TargetReference mHrefTarget;
|
||||||
nsSMILTimedElement mTimedElement;
|
nsSMILTimedElement mTimedElement;
|
||||||
nsSMILTimeContainer* mTimedDocumentRoot;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // NS_SVGANIMATIONELEMENT_H_
|
#endif // NS_SVGANIMATIONELEMENT_H_
|
||||||
|
|
Загрузка…
Ссылка в новой задаче