Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 11:58:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1559096. Rename SVGObserverUtils::mInObserverList. r=longsonr

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D34852

--HG--
extra : rebase_source : dd5459aebc8a2355e141b306bf226835c88afb68
extra : amend_source : 4b407c19cc3940e8a030f887d11b9ebe3166d271
This commit is contained in:
Jonathan Watt 2019-06-06 11:12:21 -07:00
parent 4dcb61db3b
commit 3183f85bc5
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
image/VectorImage.cpp
View File

@ -68,7 +68,7 @@ class SVGRootRenderingObserver final : public SVGRenderingObserver {
MOZ_ASSERT(elem, "no root SVG node for us to observe");
SVGObserverUtils::AddRenderingObserver(elem, this);
mInObserverList = true;
mInObserverSet = true;
}
void ResumeHonoringInvalidations() { mHonoringInvalidations = true; }
@ -103,9 +103,9 @@ class SVGRootRenderingObserver final : public SVGRenderingObserver {
// Our caller might've removed us from rendering-observer list.
// Add ourselves back!
if (!mInObserverList) {
if (!mInObserverSet) {
SVGObserverUtils::AddRenderingObserver(elem, this);
mInObserverList = true;
mInObserverSet = true;
}
}

24
layout/svg/SVGObserverUtils.cpp
View File

@ -165,12 +165,12 @@ void SVGRenderingObserver::StopObserving() {
if (target) {
target->RemoveMutationObserver(this);
if (mInObserverList) {
if (mInObserverSet) {
SVGObserverUtils::RemoveRenderingObserver(target, this);
mInObserverList = false;
mInObserverSet = false;
}
}
NS_ASSERTION(!mInObserverList, "still in an observer list?");
NS_ASSERTION(!mInObserverSet, "still in an observer set?");
}
Element* SVGRenderingObserver::GetAndObserveReferencedElement() {
@ -178,9 +178,9 @@ Element* SVGRenderingObserver::GetAndObserveReferencedElement() {
DebugObserverSet();
#endif
Element* referencedElement = GetReferencedElementWithoutObserving();
if (referencedElement && !mInObserverList) {
if (referencedElement && !mInObserverSet) {
SVGObserverUtils::AddRenderingObserver(referencedElement, this);
mInObserverList = true;
mInObserverSet = true;
}
return referencedElement;
}
@ -205,13 +205,13 @@ nsIFrame* SVGRenderingObserver::GetAndObserveReferencedFrame(
}
void SVGRenderingObserver::OnNonDOMMutationRenderingChange() {
mInObserverList = false;
mInObserverSet = false;
OnRenderingChange();
}
void SVGRenderingObserver::NotifyEvictedFromRenderingObserverSet() {
mInObserverList = false; // We've been removed from rendering-obs. list.
StopObserving(); // Remove ourselves from mutation-obs. list.
mInObserverSet = false; // We've been removed from rendering-obs. set.
StopObserving(); // Stop observing mutations too.
}
void SVGRenderingObserver::AttributeChanged(dom::Element* aElement,
@ -342,10 +342,10 @@ SVGIDRenderingObserver::SVGIDRenderingObserver(URLAndReferrerInfo* aURI,
}
void SVGIDRenderingObserver::OnRenderingChange() {
if (mObservedElementTracker.get() && mInObserverList) {
if (mObservedElementTracker.get() && mInObserverSet) {
SVGObserverUtils::RemoveRenderingObserver(mObservedElementTracker.get(),
this);
mInObserverList = false;
mInObserverSet = false;
}
}
@ -1040,11 +1040,11 @@ void SVGRenderingObserver::DebugObserverSet() {
if (referencedElement) {
SVGRenderingObserverSet* observers = GetObserverSet(referencedElement);
bool inObserverSet = observers && observers->Contains(this);
MOZ_ASSERT(inObserverSet == mInObserverList,
MOZ_ASSERT(inObserverSet == mInObserverSet,
"failed to track whether we're in our referenced element's "
"observer set!");
} else {
MOZ_ASSERT(!mInObserverList, "In whose observer set are we, then?");
MOZ_ASSERT(!mInObserverSet, "In whose observer set are we, then?");
}
}
#endif

6
layout/svg/SVGObserverUtils.h
View File

@ -103,7 +103,7 @@ class SVGRenderingObserver : public nsStubMutationObserver {
public:
typedef mozilla::dom::Element Element;
SVGRenderingObserver() : mInObserverList(false) {}
SVGRenderingObserver() : mInObserverSet(false) {}
// nsIMutationObserver
NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
@ -162,8 +162,8 @@ class SVGRenderingObserver : public nsStubMutationObserver {
void DebugObserverSet();
#endif
// Whether we're in our referenced element's observer list at this time.
bool mInObserverList;
// Whether we're in our observed element's observer set at this time.
bool mInObserverSet;
};
class SVGObserverUtils {