Bug 1488700 p11. Rename nsSVGTextPathProperty to SVGTextPathObserver. r=longsonr

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

--HG--
extra : rebase_source : c991e7eb377f97e994ad990b1e8cdfb1300bc9f6
This commit is contained in:
Jonathan Watt 2018-08-13 14:47:19 +02:00
Родитель 8d531dea08
Коммит d580509f71
3 изменённых файлов: 12 добавлений и 12 удалений

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

@ -432,14 +432,14 @@ nsSVGMaskProperty::ResolveImage(uint32_t aIndex)
}
bool
nsSVGTextPathProperty::TargetIsValid()
SVGTextPathObserver::TargetIsValid()
{
Element* target = GetTarget();
return target && target->IsSVGElement(nsGkAtoms::path);
}
void
nsSVGTextPathProperty::OnRenderingChange()
SVGTextPathObserver::OnRenderingChange()
{
nsSVGRenderingObserverProperty::OnRenderingChange();
@ -454,7 +454,7 @@ nsSVGTextPathProperty::OnRenderingChange()
// Avoid getting into an infinite loop of reflows if the <textPath> is
// pointing to one of its ancestors. TargetIsValid returns true iff
// the target element is a <path> element, and we would not have this
// nsSVGTextPathProperty if this <textPath> were a descendant of the
// SVGTextPathObserver if this <textPath> were a descendant of the
// target <path>.
//
// Note that we still have to post the restyle event when we
@ -559,9 +559,9 @@ SVGObserverUtils::GetMarkerProperty(nsIURI* aURI, nsIFrame* aFrame,
return GetEffectProperty(aURI, aFrame, aProperty);
}
nsSVGTextPathProperty*
SVGTextPathObserver*
SVGObserverUtils::GetTextPathProperty(nsIURI* aURI, nsIFrame* aFrame,
const mozilla::FramePropertyDescriptor<nsSVGTextPathProperty>* aProperty)
const mozilla::FramePropertyDescriptor<SVGTextPathObserver>* aProperty)
{
return GetEffectProperty(aURI, aFrame, aProperty);
}

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

@ -348,10 +348,10 @@ protected:
virtual void OnRenderingChange() override;
};
class nsSVGTextPathProperty final : public nsSVGRenderingObserverProperty
class SVGTextPathObserver final : public nsSVGRenderingObserverProperty
{
public:
nsSVGTextPathProperty(nsIURI* aURI, nsIFrame* aFrame, bool aReferenceImage)
SVGTextPathObserver(nsIURI* aURI, nsIFrame* aFrame, bool aReferenceImage)
: nsSVGRenderingObserverProperty(aURI, aFrame, aReferenceImage)
, mValid(true) {}
@ -496,7 +496,7 @@ public:
NS_DECLARE_FRAME_PROPERTY_RELEASABLE(FillProperty, nsSVGPaintingProperty)
NS_DECLARE_FRAME_PROPERTY_RELEASABLE(StrokeProperty, nsSVGPaintingProperty)
NS_DECLARE_FRAME_PROPERTY_RELEASABLE(HrefAsTextPathProperty,
nsSVGTextPathProperty)
SVGTextPathObserver)
NS_DECLARE_FRAME_PROPERTY_RELEASABLE(HrefAsPaintingProperty,
nsSVGPaintingProperty)
NS_DECLARE_FRAME_PROPERTY_DELETABLE(BackgroundImageProperty,
@ -659,11 +659,11 @@ public:
GetMarkerProperty(nsIURI* aURI, nsIFrame* aFrame,
const mozilla::FramePropertyDescriptor<SVGMarkerObserver>* aProperty);
/**
* Get an nsSVGTextPathProperty for the frame, creating a fresh one if necessary
* Get an SVGTextPathObserver for the frame, creating a fresh one if necessary
*/
static nsSVGTextPathProperty *
static SVGTextPathObserver *
GetTextPathProperty(nsIURI* aURI, nsIFrame* aFrame,
const mozilla::FramePropertyDescriptor<nsSVGTextPathProperty>* aProperty);
const mozilla::FramePropertyDescriptor<SVGTextPathObserver>* aProperty);
/**
* Get an nsSVGPaintingProperty for the frame, creating a fresh one if necessary
*/

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

@ -4986,7 +4986,7 @@ SVGTextFrame::AdjustPositionsForClusters()
SVGGeometryElement*
SVGTextFrame::GetTextPathGeometryElement(nsIFrame* aTextPathFrame)
{
nsSVGTextPathProperty *property =
SVGTextPathObserver *property =
aTextPathFrame->GetProperty(SVGObserverUtils::HrefAsTextPathProperty());
if (!property) {