Bug 1488700 p8. Rename CanvasFilterChainObserver to SVGFilterObserverListForCanvas. r=longsonr

Differential Revision: https://phabricator.services.mozilla.com/D5620

--HG--
extra : rebase_source : be77b64ac95430c723af3016dabcd2b0258f3eeb
This commit is contained in:
Jonathan Watt 2018-08-13 12:06:39 +02:00
Родитель 0d7aef1b78
Коммит 245517eba7
2 изменённых файлов: 9 добавлений и 9 удалений

Просмотреть файл

@ -958,12 +958,12 @@ private:
CanvasRenderingContext2D* mContext;
};
class CanvasFilterChainObserver : public SVGFilterObserverList
class SVGFilterObserverListForCanvas final : public SVGFilterObserverList
{
public:
CanvasFilterChainObserver(nsTArray<nsStyleFilter>& aFilters,
Element* aCanvasElement,
CanvasRenderingContext2D* aContext)
SVGFilterObserverListForCanvas(nsTArray<nsStyleFilter>& aFilters,
Element* aCanvasElement,
CanvasRenderingContext2D* aContext)
: SVGFilterObserverList(aFilters, aCanvasElement)
, mContext(aContext)
{
@ -1005,7 +1005,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(CanvasRenderingContext2D)
ImplCycleCollectionUnlink(tmp->mStyleStack[i].gradientStyles[Style::STROKE]);
ImplCycleCollectionUnlink(tmp->mStyleStack[i].gradientStyles[Style::FILL]);
auto filterObserverList =
static_cast<CanvasFilterChainObserver*>(tmp->mStyleStack[i].filterObserverList.get());
static_cast<SVGFilterObserverListForCanvas*>(tmp->mStyleStack[i].filterObserverList.get());
if (filterObserverList) {
filterObserverList->DetachFromContext();
}
@ -2826,8 +2826,8 @@ CanvasRenderingContext2D::SetFilter(const nsAString& aFilter, ErrorResult& aErro
filterChain.SwapElements(CurrentState().filterChain);
if (mCanvasElement) {
CurrentState().filterObserverList =
new CanvasFilterChainObserver(CurrentState().filterChain,
mCanvasElement, this);
new SVGFilterObserverListForCanvas(CurrentState().filterChain,
mCanvasElement, this);
UpdateFilter();
}
}

Просмотреть файл

@ -45,7 +45,7 @@ class ImageData;
class StringOrCanvasGradientOrCanvasPattern;
class OwningStringOrCanvasGradientOrCanvasPattern;
class TextMetrics;
class CanvasFilterChainObserver;
class SVGFilterObserverListForCanvas;
class CanvasPath;
extern const mozilla::gfx::Float SIGMA_MAX;
@ -1162,7 +1162,7 @@ protected:
}
friend class CanvasGeneralPattern;
friend class CanvasFilterChainObserver;
friend class SVGFilterObserverListForCanvas;
friend class AdjustedTarget;
friend class AdjustedTargetForShadow;
friend class AdjustedTargetForFilter;