Bug 1508358. Avoid clang-format messing up Doxygen comments in SVG code. r=longsonr
authorJonathan Watt <jwatt@jwatt.org>
Mon, 05 Nov 2018 07:03:55 +0000
changeset 448022 73cac4fab2def41df759926fe8e6fe8564c27610
parent 448021 73de720af49df25489f2f47a84c14725e326478c
child 448023 b036888636d14a020679811996ae9063b6a12e6f
push id35103
push userccoroiu@mozilla.com
push dateMon, 26 Nov 2018 22:36:54 +0000
treeherdermozilla-central@a60b595747ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslongsonr
bugs1508358
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508358. Avoid clang-format messing up Doxygen comments in SVG code. r=longsonr Differential Revision: https://phabricator.services.mozilla.com/D12336
layout/svg/SVGTextFrame.cpp
layout/svg/nsFilterInstance.h
--- a/layout/svg/SVGTextFrame.cpp
+++ b/layout/svg/SVGTextFrame.cpp
@@ -693,18 +693,18 @@ struct TextRenderedRun
    */
   SVGBBox GetFrameUserSpaceRect(nsPresContext* aContext, uint32_t aFlags) const;
 
   /**
    * Returns a rectangle that covers the fill and/or stroke of the rendered run
    * in the <text> element's user space.
    *
    * @param aContext The context to use for unit conversions.
-   * @param aFlags A combination of the flags above indicating what parts of the
-   *   text to include in the rectangle.
+   * @param aFlags A combination of the flags above indicating what parts of
+   *   the text to include in the rectangle.
    * @param aAdditionalTransform An additional transform to apply to the
    *   frame user space rectangle before its bounds are transformed into
    *   user space.
    */
   SVGBBox GetUserSpaceRect(nsPresContext* aContext, uint32_t aFlags,
                            const gfxMatrix* aAdditionalTransform = nullptr) const;
 
   /**
--- a/layout/svg/nsFilterInstance.h
+++ b/layout/svg/nsFilterInstance.h
@@ -57,22 +57,22 @@ class nsFilterInstance
   typedef mozilla::gfx::FilterPrimitiveDescription FilterPrimitiveDescription;
   typedef mozilla::gfx::FilterDescription FilterDescription;
   typedef mozilla::dom::UserSpaceMetrics UserSpaceMetrics;
   typedef mozilla::image::imgDrawingParams imgDrawingParams;
 public:
   /**
    * Create a FilterDescription for the supplied filter. All coordinates in
    * the description are in filter space.
-   * @param aFilterInputIsTainted Describes whether the SourceImage / SourceAlpha
-   *   input is tainted. This affects whether feDisplacementMap will respect
-   *   the filter input as its map input, and it affects the IsTainted() state
-   *   on the filter primitives in the FilterDescription. "Tainted" is a term
-   *   from the filters spec and means security-sensitive content, i.e. pixels
-   *   that JS should not be able to read in any way.
+   * @param aFilterInputIsTainted Describes whether the SourceImage /
+   *   SourceAlpha input is tainted. This affects whether feDisplacementMap
+   *   will respect the filter input as its map input, and it affects the
+   *   IsTainted() state on the filter primitives in the FilterDescription.
+   *   "Tainted" is a term from the filters spec and means security-sensitive
+   *   content, i.e. pixels that JS should not be able to read in any way.
    * @param aOutAdditionalImages Will contain additional images needed to
    *   render the filter (from feImage primitives).
    * @return A FilterDescription describing the filter.
    */
   static FilterDescription GetFilterDescription(nsIContent* aFilteredElement,
                                                 const nsTArray<nsStyleFilter>& aFilterChain,
                                                 bool aFilterInputIsTainted,
                                                 const UserSpaceMetrics& aMetrics,
@@ -90,18 +90,18 @@ public:
                                  nsSVGFilterPaintCallback *aPaintCallback,
                                  const nsRegion* aDirtyArea,
                                  imgDrawingParams& aImgParams,
                                  float aOpacity = 1.0f);
 
   /**
    * Returns the post-filter area that could be dirtied when the given
    * pre-filter area of aFilteredFrame changes.
-   * @param aPreFilterDirtyRegion The pre-filter area of aFilteredFrame that has
-   *   changed, relative to aFilteredFrame, in app units.
+   * @param aPreFilterDirtyRegion The pre-filter area of aFilteredFrame that
+   *   has changed, relative to aFilteredFrame, in app units.
    */
   static nsRegion GetPostFilterDirtyArea(nsIFrame *aFilteredFrame,
                                          const nsRegion& aPreFilterDirtyRegion);
 
   /**
    * Returns the pre-filter area that is needed from aFilteredFrame when the
    * given post-filter area needs to be repainted.
    * @param aPostFilterDirtyRegion The post-filter area that is dirty, relative
@@ -133,19 +133,19 @@ public:
 
 private:
   /**
    * @param aTargetFrame The frame of the filtered element under consideration,
    *   may be null.
    * @param aTargetContent The filtered element itself.
    * @param aMetrics The metrics to resolve SVG lengths against.
    * @param aFilterChain The list of filters to apply.
-   * @param aFilterInputIsTainted Describes whether the SourceImage / SourceAlpha
-   *   input is tainted. This affects whether feDisplacementMap will respect
-   *   the filter input as its map input.
+   * @param aFilterInputIsTainted Describes whether the SourceImage /
+   *   SourceAlpha input is tainted. This affects whether feDisplacementMap
+   *   will respect the filter input as its map input.
    * @param aPaintCallback [optional] The callback that Render() should use to
    *   paint. Only required if you will call Render().
    * @param aPaintTransform The transform to apply to convert to
    *   aTargetFrame's SVG user space. Only used when painting.
    * @param aPostFilterDirtyRegion [optional] The post-filter area
    *   that has to be repainted, in app units. Only required if you will
    *   call ComputeSourceNeededRect() or Render().
    * @param aPreFilterDirtyRegion [optional] The pre-filter area of