wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1181323 - Move nsSVGRenderingObserver's isupports/refcounting decl to subclasses, since one subclass (nsSVGFilterReference) already has its own redundant copy of the decl. r=dholbert

Browse Source
This commit is contained in:
Michael Layzell 2015-07-09 20:32:00 +02:00
parent f2e6cdf030
commit 7b46066b22
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
image/VectorImage.cpp
View File

@ -47,6 +47,8 @@ namespace image {
// Helper-class: SVGRootRenderingObserver // Helper-class: SVGRootRenderingObserver
class SVGRootRenderingObserver final : public nsSVGRenderingObserver { class SVGRootRenderingObserver final : public nsSVGRenderingObserver {
public: public:
NS_DECL_ISUPPORTS
SVGRootRenderingObserver(SVGDocumentWrapper* aDocWrapper, SVGRootRenderingObserver(SVGDocumentWrapper* aDocWrapper,
VectorImage* aVectorImage) VectorImage* aVectorImage)
: nsSVGRenderingObserver() : nsSVGRenderingObserver()
@ -65,10 +67,6 @@ public:
mInObserverList = true; mInObserverList = true;
} }
virtual ~SVGRootRenderingObserver()
{
StopListening();
}
void ResumeHonoringInvalidations() void ResumeHonoringInvalidations()
{ {
@ -76,6 +74,11 @@ public:
} }
protected: protected:
virtual ~SVGRootRenderingObserver()
{
StopListening();
}
virtual Element* GetTarget() override virtual Element* GetTarget() override
{ {
return mDocWrapper->GetRootSVGElem(); return mDocWrapper->GetRootSVGElem();
@ -113,6 +116,8 @@ protected:
bool mHonoringInvalidations; bool mHonoringInvalidations;
}; };
NS_IMPL_ISUPPORTS(SVGRootRenderingObserver, nsIMutationObserver)
class SVGParseCompleteListener final : public nsStubDocumentObserver { class SVGParseCompleteListener final : public nsStubDocumentObserver {
public: public:
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS

5
layout/svg/nsSVGEffects.cpp
View File

@ -21,9 +21,6 @@
using namespace mozilla; using namespace mozilla;
using namespace mozilla::dom; using namespace mozilla::dom;
// nsSVGRenderingObserver impl
NS_IMPL_ISUPPORTS(nsSVGRenderingObserver, nsIMutationObserver)
void void
nsSVGRenderingObserver::StartListening() nsSVGRenderingObserver::StartListening()
{ {
@ -219,6 +216,8 @@ nsSVGFrameReferenceFromProperty::Get()
return mFrame; return mFrame;
} }
NS_IMPL_ISUPPORTS(nsSVGRenderingObserverProperty, nsIMutationObserver)
void void
nsSVGRenderingObserverProperty::DoUpdate() nsSVGRenderingObserverProperty::DoUpdate()
{ {

7
layout/svg/nsSVGEffects.h
View File

@ -55,9 +55,6 @@ public:
: mInObserverList(false) : mInObserverList(false)
{} {}
// nsISupports
NS_DECL_ISUPPORTS
// nsIMutationObserver // nsIMutationObserver
NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED NS_DECL_NSIMUTATIONOBSERVER_ATTRIBUTECHANGED
NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED NS_DECL_NSIMUTATIONOBSERVER_CONTENTAPPENDED
@ -174,6 +171,8 @@ private:
class nsSVGRenderingObserverProperty : public nsSVGIDRenderingObserver { class nsSVGRenderingObserverProperty : public nsSVGIDRenderingObserver {
public: public:
NS_DECL_ISUPPORTS
nsSVGRenderingObserverProperty(nsIURI* aURI, nsIFrame *aFrame, nsSVGRenderingObserverProperty(nsIURI* aURI, nsIFrame *aFrame,
bool aReferenceImage) bool aReferenceImage)
: nsSVGIDRenderingObserver(aURI, aFrame->GetContent(), aReferenceImage) : nsSVGIDRenderingObserver(aURI, aFrame->GetContent(), aReferenceImage)
@ -181,6 +180,8 @@ public:
{} {}
protected: protected:
virtual ~nsSVGRenderingObserverProperty() {}
virtual void DoUpdate() override; virtual void DoUpdate() override;
nsSVGFrameReferenceFromProperty mFrameReference; nsSVGFrameReferenceFromProperty mFrameReference;