Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit bd85d1e

Browse files
committed
Bug 1405785, part 1 - Rename nsSVGRenderingObserver::Start/StopListening. r=longsonr
MozReview-Commit-ID: GF9xP8mvuCC
1 parent 3251040 commit bd85d1e

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

image/VectorImage.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class SVGRootRenderingObserver final : public nsSVGRenderingObserver {
6262
MOZ_ASSERT(mDocWrapper, "Need a non-null SVG document wrapper");
6363
MOZ_ASSERT(mVectorImage, "Need a non-null VectorImage");
6464

65-
StartListening();
65+
StartObserving();
6666
Element* elem = GetTarget();
6767
MOZ_ASSERT(elem, "no root SVG node for us to observe");
6868

@@ -79,7 +79,7 @@ class SVGRootRenderingObserver final : public nsSVGRenderingObserver {
7979
protected:
8080
virtual ~SVGRootRenderingObserver()
8181
{
82-
StopListening();
82+
StopObserving();
8383
}
8484

8585
virtual Element* GetTarget() override

layout/svg/SVGObserverUtils.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ using namespace mozilla;
2525
using namespace mozilla::dom;
2626

2727
void
28-
nsSVGRenderingObserver::StartListening()
28+
nsSVGRenderingObserver::StartObserving()
2929
{
3030
Element* target = GetTarget();
3131
if (target) {
@@ -34,7 +34,7 @@ nsSVGRenderingObserver::StartListening()
3434
}
3535

3636
void
37-
nsSVGRenderingObserver::StopListening()
37+
nsSVGRenderingObserver::StopObserving()
3838
{
3939
Element* target = GetTarget();
4040

@@ -108,7 +108,7 @@ void
108108
nsSVGRenderingObserver::NotifyEvictedFromRenderingObserverList()
109109
{
110110
mInObserverList = false; // We've been removed from rendering-obs. list.
111-
StopListening(); // Remove ourselves from mutation-obs. list.
111+
StopObserving(); // Remove ourselves from mutation-obs. list.
112112
}
113113

114114
void
@@ -184,12 +184,12 @@ nsSVGIDRenderingObserver::nsSVGIDRenderingObserver(nsIURI* aURI,
184184
{
185185
// Start watching the target element
186186
mObservedElementTracker.Reset(aObservingContent, aURI, true, aReferenceImage);
187-
StartListening();
187+
StartObserving();
188188
}
189189

190190
nsSVGIDRenderingObserver::~nsSVGIDRenderingObserver()
191191
{
192-
StopListening();
192+
StopObserving();
193193
}
194194

195195
void
@@ -246,7 +246,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsSVGFilterReference)
246246
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
247247

248248
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsSVGFilterReference)
249-
tmp->StopListening();
249+
tmp->StopObserving();
250250
NS_IMPL_CYCLE_COLLECTION_UNLINK(mObservedElementTracker);
251251
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
252252

layout/svg/SVGObserverUtils.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class nsSVGFilterChainObserver;
4040
* "GetTarget()" to specify the piece of SVG content that they'd like to
4141
* monitor, and they need to implement "DoUpdate" to specify how we'll react
4242
* when that content gets re-rendered. They also need to implement a
43-
* constructor and destructor, which should call StartListening and
44-
* StopListening, respectively.
43+
* constructor and destructor, which should call StartObserving and
44+
* StopObserving, respectively.
4545
*/
4646
class nsSVGRenderingObserver : public nsStubMutationObserver
4747
{
@@ -84,8 +84,8 @@ class nsSVGRenderingObserver : public nsStubMutationObserver
8484

8585
protected:
8686
// Non-virtual protected methods
87-
void StartListening();
88-
void StopListening();
87+
void StartObserving();
88+
void StopObserving();
8989

9090
// Virtual protected methods
9191
virtual void DoUpdate() = 0; // called when the referenced resource changes.
@@ -138,9 +138,9 @@ class nsSVGIDRenderingObserver : public nsSVGRenderingObserver
138138
{}
139139
protected:
140140
virtual void ElementChanged(Element* aFrom, Element* aTo) override {
141-
mOwningObserver->StopListening(); // stop observing the old element
141+
mOwningObserver->StopObserving(); // stop observing the old element
142142
IDTracker::ElementChanged(aFrom, aTo);
143-
mOwningObserver->StartListening(); // start observing the new element
143+
mOwningObserver->StartObserving(); // start observing the new element
144144
mOwningObserver->DoUpdate();
145145
}
146146
/**

0 commit comments

Comments
 (0)