Commit 8d531dea authored by Jonathan Watt's avatar Jonathan Watt
Browse files

Bug 1488700 p10. Rename nsSVGMarkerProperty to SVGMarkerObserver. r=longsonr 

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

--HG--
extra : rebase_source : 6409581ab4c559fda1fa7888b2ebf33030055dec
parent 9b010a0e

layout/svg/SVGGeometryFrame.h

+4 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


namespace mozilla {

class SVGGeometryFrame;

class SVGMarkerObserver;

namespace gfx {

class DrawTarget;

} // namespace gfx
@@ -29,7 +30,6 @@ class nsAtom; 
class nsIFrame;

class nsIPresShell;

class nsSVGMarkerFrame;

class nsSVGMarkerProperty;



struct nsRect;
@@ -131,9 +131,9 @@ private: 
                    imgDrawingParams& aImgParams);



  struct MarkerProperties {

    nsSVGMarkerProperty* mMarkerStart;

    nsSVGMarkerProperty* mMarkerMid;

    nsSVGMarkerProperty* mMarkerEnd;

    SVGMarkerObserver* mMarkerStart;

    SVGMarkerObserver* mMarkerMid;

    SVGMarkerObserver* mMarkerEnd;



    bool MarkersExist() const {

      return mMarkerStart || mMarkerMid || mMarkerEnd;

layout/svg/SVGObserverUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ SVGFilterObserverListForCSSProp::OnRenderingChange() 
}



void

nsSVGMarkerProperty::OnRenderingChange()

SVGMarkerObserver::OnRenderingChange()

{

  nsSVGRenderingObserverProperty::OnRenderingChange();
@@ -549,9 +549,9 @@ GetEffectProperty(nsIURI* aURI, nsIFrame* aFrame, 
  return prop;

}



nsSVGMarkerProperty*

SVGMarkerObserver*

SVGObserverUtils::GetMarkerProperty(nsIURI* aURI, nsIFrame* aFrame,

  const mozilla::FramePropertyDescriptor<nsSVGMarkerProperty>* aProperty)

  const mozilla::FramePropertyDescriptor<SVGMarkerObserver>* aProperty)

{

  MOZ_ASSERT(aFrame->IsSVGGeometryFrame() &&

             static_cast<SVGGeometryElement*>(aFrame->GetContent())->IsMarkable(),

layout/svg/SVGObserverUtils.h

+8 −8
Original line number Diff line number Diff line
@@ -338,10 +338,10 @@ protected: 
  nsSVGFrameReferenceFromProperty mFrameReference;

};



class nsSVGMarkerProperty final: public nsSVGRenderingObserverProperty

class SVGMarkerObserver final: public nsSVGRenderingObserverProperty

{

public:

  nsSVGMarkerProperty(nsIURI* aURI, nsIFrame* aFrame, bool aReferenceImage)

  SVGMarkerObserver(nsIURI* aURI, nsIFrame* aFrame, bool aReferenceImage)

    : nsSVGRenderingObserverProperty(aURI, aFrame, aReferenceImage) {}



protected:
@@ -490,9 +490,9 @@ public: 
                                      DestroyFilterProperty)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(MaskProperty, nsSVGMaskProperty)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(ClipPathProperty, nsSVGPaintingProperty)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(MarkerBeginProperty, nsSVGMarkerProperty)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(MarkerMiddleProperty, nsSVGMarkerProperty)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(MarkerEndProperty, nsSVGMarkerProperty)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(MarkerBeginProperty, SVGMarkerObserver)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(MarkerMiddleProperty, SVGMarkerObserver)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(MarkerEndProperty, SVGMarkerObserver)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(FillProperty, nsSVGPaintingProperty)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(StrokeProperty, nsSVGPaintingProperty)

  NS_DECLARE_FRAME_PROPERTY_RELEASABLE(HrefAsTextPathProperty,
@@ -653,11 +653,11 @@ public: 
  static void InvalidateDirectRenderingObservers(nsIFrame* aFrame, uint32_t aFlags = 0);



  /**

   * Get an nsSVGMarkerProperty for the frame, creating a fresh one if necessary

   * Get an SVGMarkerObserver for the frame, creating a fresh one if necessary

   */

  static nsSVGMarkerProperty *

  static SVGMarkerObserver *

  GetMarkerProperty(nsIURI* aURI, nsIFrame* aFrame,

    const mozilla::FramePropertyDescriptor<nsSVGMarkerProperty>* aProperty);

    const mozilla::FramePropertyDescriptor<SVGMarkerObserver>* aProperty);

  /**

   * Get an nsSVGTextPathProperty for the frame, creating a fresh one if necessary

   */