Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1403500, part 1 - Document and do some renaming for SVGObserverUtils' SourceReference. r=longsonr

Browse Source 
MozReview-Commit-ID: Hd7uzHltyMl
This commit is contained in:
Jonathan Watt 2017-09-12 09:36:08 +01:00
parent 4fa395cf9c
commit a9811eda2d
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/svg/SVGObserverUtils.cpp
View File

@ -180,10 +180,10 @@ nsSVGRenderingObserver::ContentRemoved(nsIDocument* aDocument,
nsSVGIDRenderingObserver::nsSVGIDRenderingObserver(nsIURI* aURI,
nsIContent* aObservingContent,
bool aReferenceImage)
: mElement(this)
: mObservedElementTracker(this)
{
// Start watching the target element
mElement.Reset(aObservingContent, aURI, true, aReferenceImage);
mObservedElementTracker.Reset(aObservingContent, aURI, true, aReferenceImage);
StartListening();
}
@ -195,8 +195,8 @@ nsSVGIDRenderingObserver::~nsSVGIDRenderingObserver()
void
nsSVGIDRenderingObserver::DoUpdate()
{
if (mElement.get() && mInObserverList) {
SVGObserverUtils::RemoveRenderingObserver(mElement.get(), this);
if (mObservedElementTracker.get() && mInObserverList) {
SVGObserverUtils::RemoveRenderingObserver(mObservedElementTracker.get(), this);
mInObserverList = false;
}
}
@ -242,12 +242,12 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsSVGFilterReference)
NS_IMPL_CYCLE_COLLECTION_CLASS(nsSVGFilterReference)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsSVGFilterReference)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mElement)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mObservedElementTracker)
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsSVGFilterReference)
tmp->StopListening();
NS_IMPL_CYCLE_COLLECTION_UNLINK(mElement);
NS_IMPL_CYCLE_COLLECTION_UNLINK(mObservedElementTracker);
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsSVGFilterReference)

23
layout/svg/SVGObserverUtils.h
View File

@ -120,21 +120,28 @@ public:
virtual ~nsSVGIDRenderingObserver();
protected:
Element* GetTarget() override { return mElement.get(); }
Element* GetTarget() override { return mObservedElementTracker.get(); }
// This is called when the referenced resource changes.
virtual void DoUpdate() override;
class SourceReference : public IDTracker
/**
* Helper that provides a reference to the element with the ID that our
* observer wants to observe, and that will invalidate our observer if the
* element that that ID identifies changes to a different element (or none).
*/
class ElementTracker final : public IDTracker
{
public:
explicit SourceReference(nsSVGIDRenderingObserver* aContainer) : mContainer(aContainer) {}
explicit ElementTracker(nsSVGIDRenderingObserver* aOwningObserver)
: mOwningObserver(aOwningObserver)
{}
protected:
virtual void ElementChanged(Element* aFrom, Element* aTo) override {
mContainer->StopListening();
mOwningObserver->StopListening(); // stop observing the old element
IDTracker::ElementChanged(aFrom, aTo);
mContainer->StartListening();
mContainer->DoUpdate();
mOwningObserver->StartListening(); // start observing the new element
mOwningObserver->DoUpdate();
}
/**
* Override IsPersistent because we want to keep tracking the element
@ -142,10 +149,10 @@ protected:
*/
virtual bool IsPersistent() override { return true; }
private:
nsSVGIDRenderingObserver* mContainer;
nsSVGIDRenderingObserver* mOwningObserver;
};
SourceReference mElement;
ElementTracker mObservedElementTracker;
};
struct nsSVGFrameReferenceFromProperty