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 1062832 - Create abstract class nsSVGFilterChainObserver for observers without frames. r=roc

Browse Source
This commit is contained in:
Markus Stange 2014-09-09 17:14:46 +02:00
parent d95082e95a
commit 85d464e537
2 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
layout/svg/nsSVGEffects.cpp
View File

@ -252,24 +252,22 @@ nsSVGFilterReference::DoUpdate()
}
}
NS_IMPL_ISUPPORTS(nsSVGFilterProperty, nsISupports)
NS_IMPL_ISUPPORTS(nsSVGFilterChainObserver, nsISupports)
nsSVGFilterProperty::nsSVGFilterProperty(const nsTArray<nsStyleFilter> &aFilters,
nsIFrame *aFilteredFrame)
: mFrameReference(aFilteredFrame)
nsSVGFilterChainObserver::nsSVGFilterChainObserver(const nsTArray<nsStyleFilter>& aFilters,
nsIContent* aFilteredElement)
{
nsIContent* filteredElement = aFilteredFrame->GetContent();
for (uint32_t i = 0; i < aFilters.Length(); i++) {
if (aFilters[i].GetType() != NS_STYLE_FILTER_URL)
continue;
nsRefPtr<nsSVGFilterReference> reference =
new nsSVGFilterReference(aFilters[i].GetURL(), filteredElement, this);
new nsSVGFilterReference(aFilters[i].GetURL(), aFilteredElement, this);
mReferences.AppendElement(reference);
}
}
nsSVGFilterProperty::~nsSVGFilterProperty()
nsSVGFilterChainObserver::~nsSVGFilterChainObserver()
{
for (uint32_t i = 0; i < mReferences.Length(); i++) {
mReferences[i]->DetachFromChainObserver();
@ -277,7 +275,7 @@ nsSVGFilterProperty::~nsSVGFilterProperty()
}
bool
nsSVGFilterProperty::ReferencesValidResources()
nsSVGFilterChainObserver::ReferencesValidResources()
{
for (uint32_t i = 0; i < mReferences.Length(); i++) {
if (!mReferences[i]->ReferencesValidResource())
@ -287,7 +285,7 @@ nsSVGFilterProperty::ReferencesValidResources()
}
bool
nsSVGFilterProperty::IsInObserverLists() const
nsSVGFilterChainObserver::IsInObserverLists() const
{
for (uint32_t i = 0; i < mReferences.Length(); i++) {
if (!mReferences[i]->IsInObserverList())

33
layout/svg/nsSVGEffects.h
View File

@ -29,7 +29,7 @@ class nsSVGClipPathFrame;
class nsSVGPaintServerFrame;
class nsSVGFilterFrame;
class nsSVGMaskFrame;
class nsSVGFilterProperty;
class nsSVGFilterChainObserver;
/*
* This interface allows us to be notified when a piece of SVG content is
@ -195,14 +195,14 @@ protected:
* It fires invalidations when the SVG filter element's id changes or when
* the SVG filter element's content changes.
*
* The nsSVGFilterProperty class manages a list of nsSVGFilterReferences.
* The nsSVGFilterChainObserver class manages a list of nsSVGFilterReferences.
*/
class nsSVGFilterReference MOZ_FINAL :
public nsSVGIDRenderingObserver, public nsISVGFilterReference {
public:
nsSVGFilterReference(nsIURI* aURI,
nsIContent* aObservingContent,
nsSVGFilterProperty* aFilterChainObserver)
nsSVGFilterChainObserver* aFilterChainObserver)
: nsSVGIDRenderingObserver(aURI, aObservingContent, false)
, mFilterChainObserver(aFilterChainObserver)
{
@ -230,7 +230,7 @@ protected:
virtual void DoUpdate() MOZ_OVERRIDE;
private:
nsSVGFilterProperty* mFilterChainObserver;
nsSVGFilterChainObserver* mFilterChainObserver;
};
/**
@ -238,15 +238,15 @@ private:
* reference filters in a filter chain.
* e.g. filter: url(#svg-filter-1) blur(10px) url(#svg-filter-2);
*
* In the above example, the nsSVGFilterProperty will manage two
* In the above example, the nsSVGFilterChainObserver will manage two
* nsSVGFilterReferences, one for each SVG reference filter. CSS filters like
* "blur(10px)" don't reference filter elements, so they don't need an
* nsSVGFilterReference. The style system invalidates changes to CSS filters.
*/
class nsSVGFilterProperty : public nsISupports {
class nsSVGFilterChainObserver : public nsISupports {
public:
nsSVGFilterProperty(const nsTArray<nsStyleFilter> &aFilters,
nsIFrame *aFilteredFrame);
nsSVGFilterChainObserver(const nsTArray<nsStyleFilter>& aFilters,
nsIContent* aFilteredElement);
bool ReferencesValidResources();
bool IsInObserverLists() const;
@ -256,12 +256,25 @@ public:
NS_DECL_ISUPPORTS
protected:
virtual ~nsSVGFilterProperty();
virtual ~nsSVGFilterChainObserver();
virtual void DoUpdate();
virtual void DoUpdate() = 0;
private:
nsTArray<nsRefPtr<nsSVGFilterReference>> mReferences;
};
class nsSVGFilterProperty : public nsSVGFilterChainObserver {
public:
nsSVGFilterProperty(const nsTArray<nsStyleFilter> &aFilters,
nsIFrame *aFilteredFrame)
: nsSVGFilterChainObserver(aFilters, aFilteredFrame->GetContent())
, mFrameReference(aFilteredFrame)
{}
protected:
virtual void DoUpdate() MOZ_OVERRIDE;
nsSVGFrameReferenceFromProperty mFrameReference;
};