Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1318223 - Use NonOwningAnimationTarget in OwningElementRef. r=boris, r=birtles

Browse Source 
--HG--
extra : amend_source : efe698c05bcee0c34d99b8242d8f147373cf2584
This commit is contained in:
Christopher Bathgate 2017-03-26 16:46:00 -04:00
parent a71d5e3e25
commit 8a23013745
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dom/animation/AnimationTarget.h
View File

@ -40,12 +40,20 @@ struct OwningAnimationTarget
struct NonOwningAnimationTarget
{
NonOwningAnimationTarget() = default;
NonOwningAnimationTarget(dom::Element* aElement, CSSPseudoElementType aType)
: mElement(aElement), mPseudoType(aType) { }
explicit NonOwningAnimationTarget(const OwningAnimationTarget& aOther)
: mElement(aOther.mElement), mPseudoType(aOther.mPseudoType) { }
bool operator==(const NonOwningAnimationTarget& aOther) const
{
return mElement == aOther.mElement &&
mPseudoType == aOther.mPseudoType;
}
// mElement represents the parent element of a pseudo-element, not the
// generated content element.
dom::Element* MOZ_NON_OWNING_REF mElement = nullptr;

39
layout/style/AnimationCommon.h
View File

@ -13,6 +13,7 @@
#include "mozilla/LinkedList.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/dom/Animation.h"
#include "mozilla/AnimationTarget.h"
#include "mozilla/Attributes.h" // For MOZ_NON_OWNING_REF
#include "mozilla/Assertions.h"
#include "mozilla/TimingParams.h"
@ -111,48 +112,48 @@ protected:
class OwningElementRef final
{
public:
OwningElementRef()
: mElement(nullptr)
, mPseudoType(CSSPseudoElementType::NotPseudo)
OwningElementRef() = default;
explicit OwningElementRef(const NonOwningAnimationTarget& aTarget)
: mTarget(aTarget)
{ }
OwningElementRef(dom::Element& aElement,
CSSPseudoElementType aPseudoType)
: mElement(&aElement)
, mPseudoType(aPseudoType)
: mTarget(&aElement, aPseudoType)
{ }
bool Equals(const OwningElementRef& aOther) const
{
return mElement == aOther.mElement &&
mPseudoType == aOther.mPseudoType;
return mTarget == aOther.mTarget;
}
bool LessThan(const OwningElementRef& aOther) const
{
MOZ_ASSERT(mElement && aOther.mElement,
MOZ_ASSERT(mTarget.mElement && aOther.mTarget.mElement,
"Elements to compare should not be null");
if (mElement != aOther.mElement) {
return nsContentUtils::PositionIsBefore(mElement, aOther.mElement);
if (mTarget.mElement != aOther.mTarget.mElement) {
return nsContentUtils::PositionIsBefore(mTarget.mElement,
aOther.mTarget.mElement);
}
return mPseudoType == CSSPseudoElementType::NotPseudo ||
(mPseudoType == CSSPseudoElementType::before &&
aOther.mPseudoType == CSSPseudoElementType::after);
return mTarget.mPseudoType == CSSPseudoElementType::NotPseudo ||
(mTarget.mPseudoType == CSSPseudoElementType::before &&
aOther.mTarget.mPseudoType == CSSPseudoElementType::after);
}
bool IsSet() const { return !!mElement; }
bool IsSet() const { return !!mTarget.mElement; }
void GetElement(dom::Element*& aElement,
CSSPseudoElementType& aPseudoType) const {
aElement = mElement;
aPseudoType = mPseudoType;
CSSPseudoElementType& aPseudoType) const
{
aElement = mTarget.mElement;
aPseudoType = mTarget.mPseudoType;
}
private:
dom::Element* MOZ_NON_OWNING_REF mElement;
CSSPseudoElementType mPseudoType;
NonOwningAnimationTarget mTarget;
};
template <class EventInfo>