Enable ClangTidy check llvm-namespace-comment.

This fixes a large number of SkSL namespaces which were labeled as if
they were anonymous, and also a handful of other mislabeled namespaces.
Missing namespace-end comments have been added throughout.
A number of diffs are just indentation-related (adjusting 1- or 3-
space indents to 2-space).

Change-Id: I6c62052a0d3aea4ae12ca07e0c2a8587b2fce4ec
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/308503
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>

.clang-tidy

@@ -1 +1,4 @@
-Checks: '-*,bugprone-use-after-move,bugprone-unused-raii,bugprone-undelegated-constructor,bugprone-argument-comment,performance-for-range-copy,bugprone-bool-pointer-implicit-conversion,readability-redundant-preprocessor,misc-definitions-in-headers,modernize-make-unique,google-build-namespaces'
+Checks: '-*,bugprone-use-after-move,bugprone-unused-raii,bugprone-undelegated-constructor,bugprone-argument-comment,performance-for-range-copy,bugprone-bool-pointer-implicit-conversion,readability-redundant-preprocessor,misc-definitions-in-headers,modernize-make-unique,llvm-namespace-comment,google-build-namespaces'
+CheckOptions:
+  - key:             llvm-namespace-comment.SpacesBeforeComments
+    value:           2

bench/BitmapRegionDecoderBench.h

@@ -18,8 +18,8 @@
 namespace android {
 namespace skia {
 class BitmapRegionDecoder;
-}
-}
+}  // namespace skia
+}  // namespace android
 
 /**
  *  Benchmark Android's BitmapRegionDecoder for a particular colorType, sampleSize, and subset.

bench/CmapBench.cpp

@@ -25,7 +25,7 @@ struct Rec {
     const SkUnichar*            fText;
     int                         fCount;
 };
-}
+}  // namespace
 
 typedef void (*TypefaceProc)(const Rec& r);
 

bench/GrMemoryPoolBench.cpp

@@ -32,7 +32,7 @@ static_assert(GrAlignTo(sizeof(Unaligned), GrMemoryPool::kAlignment) == sizeof(A
 // of operations, the size of the objects being allocated, and the size of the pool.
 typedef void (*RunBenchProc)(GrMemoryPool*, int);
 
-}
+}  // namespace
 
 // N objects are created, and then destroyed in reverse order (fully unwinding the cursor within
 // each block of the memory pool).

bench/ImageCacheBench.cpp

@@ -33,7 +33,7 @@ struct TestRec : public SkResourceCache::Rec {
         return true;
     }
 };
-}
+}  // namespace
 
 class ImageCacheBench : public Benchmark {
     SkResourceCache fCache;

bench/SkVMBench.cpp

@@ -15,7 +15,7 @@ namespace {
     enum Mode {Opts, RP, F32, I32_Naive};
     static const char* kMode_name[] = { "Opts", "RP","F32", "I32_Naive" };
 
-}
+}  // namespace
 
 class SkVMBench : public Benchmark {
 public:

bench/VertexColorSpaceBench.cpp

@@ -275,7 +275,7 @@ private:
 
     typedef GrMeshDrawOp INHERITED;
 };
-}
+}  // namespace
 
 class VertexColorSpaceBench : public Benchmark {
 public:

dm/DMSrcSink.h

@@ -25,8 +25,8 @@
 namespace skiagm {
 namespace verifiers {
 class VerifierList;
-}
-}
+}  // namespace verifiers
+}  // namespace skiagm
 
 namespace DM {
 

experimental/skrive/include/SkRive.h

@@ -315,6 +315,6 @@ private:
     std::vector<sk_sp<Artboard>> fArtboards;
 };
 
-} // skrive
+}  // namespace skrive
 
 #endif // SkRive_DEFINED

experimental/skrive/src/Node.cpp

@@ -44,7 +44,7 @@ size_t parse_node<Node>(StreamReader* sr, Node* node) {
     return parent_id;
 }
 
-} // namespace skrive
+}  // namespace internal
 
 void Node::addChild(sk_sp<Component> child) {
     child->fParent = this;
@@ -74,4 +74,4 @@ void Node::onRender(SkCanvas* canvas) const {
 }
 
 
-} // namespace internal
+}  // namespace skrive

experimental/skrive/src/reader/BinaryReader.cpp

@@ -150,4 +150,4 @@ std::unique_ptr<StreamReader> MakeBinaryStreamReader(std::unique_ptr<SkStreamAss
     return std::make_unique<BinaryReader>(std::move(stream));
 }
 
-}
+}  // namespace skrive::internal

experimental/skrive/src/reader/StreamReader.h

@@ -103,6 +103,6 @@ protected:
     virtual size_t readFloatArray(const char label[], float dst[], size_t count) = 0;
 };
 
-}
+}  // namespace skrive::internal
 
 #endif // SkRiveStreamreader_DEFINED

experimental/svg/model/SkPEG.h

@@ -239,6 +239,6 @@ struct LIT<C, Cs...> {
     }
 };
 
-} // skpeg ns
+}  // namespace skpeg
 
 #endif // SkPEG_DEFINED

experimental/svg/model/SkSVGAttributeParser.cpp

@@ -30,7 +30,7 @@ inline bool is_sep(char c) {
     return is_ws(c) || c == ',' || c == ';';
 }
 
-} // anonymous ns
+}  // namespace
 
 SkSVGAttributeParser::SkSVGAttributeParser(const char attributeString[])
     : fCurPos(attributeString) {}

experimental/svg/model/SkSVGRenderContext.cpp

@@ -38,7 +38,7 @@ constexpr SkScalar kPCMultiplier = kPTMultiplier * 12;
 constexpr SkScalar kMMMultiplier = kINMultiplier / 25.4f;
 constexpr SkScalar kCMMultiplier = kMMMultiplier * 10;
 
-} // anonymous ns
+}  // namespace
 
 SkScalar SkSVGLengthContext::resolve(const SkSVGLength& l, LengthType t) const {
     switch (l.unit()) {
@@ -274,7 +274,7 @@ void commitToPaint<SkSVGAttribute::kColor>(const SkSVGPresentationAttributes&,
     // Not part of the SkPaint state; applied via 'currentColor' color value
 }
 
-} // anonymous ns
+}  // namespace
 
 SkSVGPresentationContext::SkSVGPresentationContext()
     : fInherited(SkSVGPresentationAttributes::MakeInitial()) {

gm/androidblendmodes.cpp

@@ -133,4 +133,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new AndroidBlendModesGM;)
-}
+}  // namespace skiagm

gm/anisotropic.cpp

@@ -121,4 +121,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new AnisotropicGM;)
-}
+}  // namespace skiagm

gm/arcofzorro.cpp

@@ -87,4 +87,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ArcOfZorroGM;)
-}
+}  // namespace skiagm

gm/bc1_transparency.cpp

@@ -216,4 +216,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new BC1TransparencyGM;)
-}
+}  // namespace skiagm

gm/beziereffects.cpp

@@ -502,4 +502,4 @@ private:
 
 DEF_GM(return new BezierConicEffects;)
 DEF_GM(return new BezierQuadEffects;)
-}
+}  // namespace skiagm

gm/bigblurs.cpp

@@ -121,4 +121,4 @@ private:
 };
 
 DEF_GM(return new BigBlursGM;)
-}
+}  // namespace skiagm

gm/bigrrectaaeffect.cpp

@@ -141,4 +141,4 @@ DEF_GM( return new BigRRectAAEffectGM (SkRRect::MakeOval(SkRect::MakeIWH(kSize -
 DEF_GM( return new BigRRectAAEffectGM (SkRRect::MakeRectXY(SkRect::MakeIWH(kSize - 1, kSize - 10), kSize/2.f - 10.f, kSize/2.f - 10.f), "circular_corner"); )
 DEF_GM( return new BigRRectAAEffectGM (SkRRect::MakeRectXY(SkRect::MakeIWH(kSize - 1, kSize - 10), kSize/2.f - 10.f, kSize/2.f - 15.f), "elliptical_corner"); )
 
-}
+}  // namespace skiagm

gm/bigtileimagefilter.cpp

@@ -118,4 +118,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new BigTileImageFilterGM;)
-}
+}  // namespace skiagm

gm/bitmapimage.cpp

@@ -86,4 +86,4 @@ private:
 
 DEF_GM( return new BitmapImageGM; )
 
-}
+}  // namespace skiagm

gm/bitmappremul.cpp

@@ -115,4 +115,4 @@ private:
 };
 
 DEF_GM( return new BitmapPremulGM; )
-}
+}  // namespace skiagm

gm/bitmapshader.cpp

@@ -146,4 +146,4 @@ DEF_SIMPLE_GM(hugebitmapshader, canvas, 100, 100) {
 
 DEF_GM( return new BitmapShaderGM; )
 
-}
+}  // namespace skiagm

gm/blurredclippedcircle.cpp

@@ -96,4 +96,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new BlurredClippedCircleGM;)
-}
+}  // namespace skiagm

gm/circles.cpp

@@ -211,4 +211,4 @@ private:
 
 DEF_GM( return new CircleGM; )
 
-}
+}  // namespace skiagm

gm/clockwise.cpp

@@ -299,4 +299,4 @@ void ClockwiseGM::onDraw(GrRecordingContext* ctx, GrRenderTargetContext* rtc, Sk
 
 DEF_GM( return new ClockwiseGM(); )
 
-}
+}  // namespace

gm/collapsepaths.cpp

@@ -141,7 +141,7 @@ void test_collapse10(SkCanvas* canvas, const SkPaint& paint) {
     canvas->drawPath(path.detach(), paint);
 }
 
-};
+}  // namespace
 
 DEF_SIMPLE_GM(collapsepaths, canvas, 500, 600) {
     SkPaint paint;

gm/coloremoji.cpp

@@ -198,4 +198,4 @@ protected:
 
 DEF_GM(return new ColorEmojiGM;)
 
-}
+}  // namespace skiagm

gm/complexclip.cpp

@@ -207,7 +207,7 @@ DEF_GM(return new ComplexClipGM(true, false, false);)
 DEF_GM(return new ComplexClipGM(true, false, true);)
 DEF_GM(return new ComplexClipGM(true, true, false);)
 DEF_GM(return new ComplexClipGM(true, true, true);)
-}
+}  // namespace skiagm
 
 DEF_SIMPLE_GM(clip_shader, canvas, 840, 650) {
     auto img = GetResourceAsImage("images/yellow_rose.png");
@@ -343,7 +343,7 @@ static void draw_banner(SkCanvas* canvas, Config config) {
     canvas->drawString(banner.c_str(), 20.f, -30.f, kFont, SkPaint());
 };
 
-} // anonymous
+}  // namespace
 
 DEF_SIMPLE_GM(clip_shader_persp, canvas, 1370, 1030) {
     // Each draw has a clipShader(image-shader), a clipShader(gradient-shader), a concat(persp-mat),

gm/complexclip2.cpp

@@ -224,4 +224,4 @@ DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRect_Clip, true); )
 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRRect_Clip, true); )
 DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kPath_Clip, true); )
 
-}
+}  // namespace skiagm

gm/complexclip3.cpp

@@ -138,4 +138,4 @@ private:
 DEF_GM( return new ComplexClip3GM(true); )
 // Complex clip first
 DEF_GM( return new ComplexClip3GM(false); )
-}
+}  // namespace skiagm

gm/complexclip4.cpp

@@ -134,4 +134,4 @@ private:
 
 DEF_GM(return new ComplexClip4GM(false);)
 DEF_GM(return new ComplexClip4GM(true);)
-}
+}  // namespace skiagm

gm/complexclip_blur_tiled.cpp

@@ -75,4 +75,4 @@ private:
 
 DEF_GM(return new ComplexClipBlurTiledGM;)
 
-}
+}  // namespace skiagm

gm/concavepaths.cpp

@@ -361,7 +361,7 @@ void test_coincident_edges_4(SkCanvas* canvas, const SkPaint& paint) {
     canvas->restore();
 }
 
-};
+}  // namespace
 
 DEF_SIMPLE_GM(concavepaths, canvas, 500, 600) {
     SkPaint paint;

gm/constcolorprocessor.cpp

@@ -220,4 +220,4 @@ DEF_GM(return new ColorProcessor{ColorProcessor::TestMode::kConstColor};)
 DEF_GM(return new ColorProcessor{ColorProcessor::TestMode::kModulateRGBA};)
 DEF_GM(return new ColorProcessor{ColorProcessor::TestMode::kModulateAlpha};)
 
-}
+}  // namespace skiagm

gm/convex_all_line_paths.cpp

@@ -161,7 +161,7 @@ const size_t gSizes[] = {
     SK_ARRAY_COUNT(gPoints10),
 };
 static_assert(SK_ARRAY_COUNT(gSizes) == SK_ARRAY_COUNT(gPoints), "array_mismatch");
-}
+}  // namespace ConvexLineOnlyData
 
 namespace skiagm {
 
@@ -412,4 +412,4 @@ private:
 
 DEF_GM(return new ConvexLineOnlyPathsGM(false);)
 DEF_GM(return new ConvexLineOnlyPathsGM(true);)
-}
+}  // namespace skiagm

gm/convexpolyclip.cpp

@@ -313,4 +313,4 @@ private:
 };
 
 DEF_GM(return new ConvexPolyClip;)
-}
+}  // namespace skiagm

gm/convexpolyeffect.cpp

@@ -206,4 +206,4 @@ private:
 };
 
 DEF_GM(return new ConvexPolyEffect;)
-}
+}  // namespace skiagm

gm/croppedrects.cpp

@@ -115,4 +115,4 @@ private:
 
 DEF_GM( return new CroppedRectsGM(); )
 
-}
+}  // namespace skiagm

gm/degeneratesegments.cpp

@@ -370,4 +370,4 @@ class DegenerateSegmentsGM : public GM {
 
 DEF_GM( return new DegenerateSegmentsGM; )
 
-}
+}  // namespace skiagm

gm/discard.cpp

@@ -99,4 +99,4 @@ private:
 
 DEF_GM(return new DiscardGM;)
 
-} // end namespace
+}  // namespace skiagm

gm/displacement.cpp

@@ -171,4 +171,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new DisplacementMapGM;)
-}
+}  // namespace skiagm

gm/distantclip.cpp

@@ -65,4 +65,4 @@ class DistantClipGM : public GM {
 
 DEF_GM( return new DistantClipGM; )
 
-}
+}  // namespace skiagm

gm/dstreadshuffle.cpp

@@ -200,4 +200,4 @@ private:
 
 DEF_GM( return new DstReadShuffle; )
 
-}
+}  // namespace skiagm

gm/emptypath.cpp

@@ -185,4 +185,4 @@ class EmptyStrokeGM : public GM {
 };
 DEF_GM( return new EmptyStrokeGM; )
 
-}
+}  // namespace skiagm

gm/encode.cpp

@@ -55,7 +55,7 @@ private:
 };
 
 DEF_GM( return new EncodeGM; )
-}
+}  // namespace skiagm
 
 ///////////
 

gm/encode_alpha_jpeg.cpp

@@ -108,4 +108,4 @@ private:
 
 DEF_GM( return new EncodeJpegAlphaOptsGM; )
 
-};
+}  // namespace skiagm

gm/encode_color_types.cpp

@@ -167,4 +167,4 @@ private:
 
 DEF_VARIANTS(SkEncodedImageFormat::kWEBP, 100, "webp-lossless")
 DEF_VARIANTS(SkEncodedImageFormat::kWEBP,  80, "webp-lossy")
-}
+}  // namespace skiagm

gm/encode_platform.cpp

@@ -131,4 +131,4 @@ private:
 };
 
 DEF_GM( return new EncodePlatformGM; )
-}
+}  // namespace skiagm

gm/encode_srgb.cpp

@@ -150,4 +150,4 @@ private:
 DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kPNG); )
 DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kWEBP); )
 DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kJPEG); )
-}
+}  // namespace skiagm

gm/exoticformats.cpp

@@ -440,4 +440,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ExoticFormatsGM;)
-}
+}  // namespace skiagm

gm/extractbitmap.cpp

@@ -84,4 +84,4 @@ private:
 
 DEF_GM( return new ExtractBitmapGM; )
 
-}
+}  // namespace skiagm

gm/filltypes.cpp

@@ -99,4 +99,4 @@ private:
 
 DEF_GM( return new FillTypeGM; )
 
-}
+}  // namespace skiagm

gm/filltypespersp.cpp

@@ -139,4 +139,4 @@ private:
 
 DEF_GM( return new FillTypePerspGM; )
 
-}
+}  // namespace skiagm

gm/filterfastbounds.cpp

@@ -325,4 +325,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ImageFilterFastBoundGM;)
-}
+}  // namespace skiagm

gm/fontscaler.cpp

@@ -85,4 +85,4 @@ private:
 
 DEF_GM( return new FontScalerGM; )
 
-}
+}  // namespace skiagm

gm/fontscalerdistortable.cpp

@@ -140,4 +140,4 @@ private:
 
 DEF_GM( return new FontScalerDistortableGM; )
 
-}
+}  // namespace skiagm

gm/fwidth_squircle.cpp

@@ -263,4 +263,4 @@ DEF_SIMPLE_GPU_GM_CAN_FAIL(fwidth_squircle, ctx, rtc, canvas, errorMsg, 200, 200
     return skiagm::DrawResult::kOk;
 }
 
-}
+}  // namespace skiagm

gm/gm.h

@@ -251,7 +251,7 @@ namespace skiagm {
         const SkISize fSize;
         const DrawProc fDrawProc;
     };
-}
+}  // namespace skiagm
 
 void MarkGMGood(SkCanvas*, SkScalar x, SkScalar y);
 void MarkGMBad (SkCanvas*, SkScalar x, SkScalar y);

gm/gradients_2pt_conical.cpp

@@ -407,4 +407,4 @@ DEF_GM( return new ConicalGradientsGM(kInside_GradCaseType, false); )
 DEF_GM( return new ConicalGradientsGM(kOutside_GradCaseType, false); )
 DEF_GM( return new ConicalGradientsGM(kEdge_GradCaseType, false); )
 
-}
+}  // namespace skiagm

gm/hairlines.cpp

@@ -299,4 +299,4 @@ DEF_SIMPLE_GM(hairline_subdiv, canvas, 512, 256) {
 
 DEF_GM( return new HairlinesGM; )
 
-}
+}  // namespace skiagm

gm/hairmodes.cpp

@@ -132,4 +132,4 @@ namespace skiagm {
     //////////////////////////////////////////////////////////////////////////////
 
     DEF_GM( return new HairModesGM; )
-}
+}  // namespace skiagm

gm/imageblurclampmode.cpp

@@ -111,4 +111,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ImageBlurClampModeGM;)
-}
+}  // namespace skiagm

gm/imageblurrepeatmode.cpp

@@ -125,7 +125,7 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ImageBlurRepeatModeGM;)
-}
+}  // namespace skiagm
 
 // See skbug.com/10145 for more context, but if the blur doesn't have its own crop rect and
 // the canvas is not clipped, repeat can behave strangely (before fixes, this meant:

gm/imageblurtiled.cpp

@@ -78,4 +78,4 @@ private:
 
 DEF_GM(return new  ImageBlurTiledGM(3.0f, 3.0f);)
 
-}
+}  // namespace skiagm

gm/imagefiltersbase.cpp

@@ -85,7 +85,7 @@ namespace {
             SK_REGISTER_FLATTENABLE(FailImageFilter);
         }
     } initializer;
-}
+}  // namespace
 
 sk_sp<SkFlattenable> IdentityImageFilter::CreateProc(SkReadBuffer& buffer) {
     SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);

gm/imagefiltersclipped.cpp

@@ -156,4 +156,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ImageFiltersClippedGM;)
-}
+}  // namespace skiagm

gm/imagefilterscropexpand.cpp

@@ -33,7 +33,7 @@ sk_sp<SkImage> make_gradient_circle(int width, int height);
 void draw(SkCanvas* canvas, const SkBitmap& bitmap, const SkIRect& rect,
                  sk_sp<SkImageFilter> filter);
 
-};
+}  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -163,4 +163,4 @@ namespace {
 
         canvas->translate(SkIntToScalar(80), 0);
     }
-};
+}  // namespace

gm/imagefiltersscaled.cpp

@@ -162,4 +162,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ImageFiltersScaledGM;)
-}
+}  // namespace skiagm

gm/imagefiltersstroked.cpp

@@ -109,4 +109,4 @@ private:
 
 DEF_GM(return new ImageFiltersStrokedGM;)
 
-}
+}  // namespace skiagm

gm/imagefilterstransformed.cpp

@@ -123,7 +123,7 @@ private:
     typedef GM INHERITED;
 };
 DEF_GM( return new ImageFiltersTransformedGM; )
-}
+}  // namespace skiagm
 
 //////////////////////////////////////////////////////////////////////////////
 

gm/imagefromyuvtextures.cpp

@@ -335,4 +335,4 @@ private:
 };
 
 DEF_GM(return new ImageFromYUVTextures;)
-}
+}  // namespace skiagm

gm/imagemakewithfilter.cpp

@@ -178,7 +178,7 @@ namespace {
         // Uses saveLayer after clipRect() to filter on the restore (i.e. reference image)
         kSaveLayer
     };
-};
+}  // namespace
 
 // In this GM, we're going to feed the inner portion of a 100x100 mandrill (i.e., strip off a
 // 25-wide border) through the makeWithFilter method. We'll then draw the appropriate subset of the

gm/imagemasksubset.cpp

@@ -70,7 +70,7 @@ const MakerT makers[] = {
     },
 };
 
-} // anonymous ns
+}  // namespace
 
 // Checks whether subset SkImages preserve the original color type (A8 in this case).
 DEF_SIMPLE_GM(imagemasksubset, canvas, 480, 480) {

gm/imagesource2.cpp

@@ -99,4 +99,4 @@ DEF_GM(return new ImageSourceGM("none", kNone_SkFilterQuality);)
 DEF_GM(return new ImageSourceGM("low", kLow_SkFilterQuality);)
 DEF_GM(return new ImageSourceGM("med", kMedium_SkFilterQuality);)
 DEF_GM(return new ImageSourceGM("high", kHigh_SkFilterQuality);)
-}
+}  // namespace skiagm

gm/jpg_color_cube.cpp

@@ -69,4 +69,4 @@ private:
 };
 
 DEF_GM( return new ColorCubeGM; )
-}
+}  // namespace skiagm

gm/lcdblendmodes.cpp

@@ -152,4 +152,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new LcdBlendGM; )
-}
+}  // namespace skiagm

gm/lcdoverlap.cpp

@@ -97,4 +97,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new LcdOverlapGM; )
-}
+}  // namespace skiagm

gm/lighting.cpp

@@ -153,4 +153,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new ImageLightingGM;)
-}
+}  // namespace skiagm

gm/mandoline.cpp

@@ -198,4 +198,4 @@ protected:
 
 DEF_GM(return new SliverPathsGM;)
 
-}
+}  // namespace skiagm

gm/manypaths.cpp

@@ -125,4 +125,4 @@ private:
 DEF_GM( return new ManyCirclesGM; )
 DEF_GM( return new ManyRRectsGM; )
 
-}
+}  // namespace skiagm

gm/matrixconvolution.cpp

@@ -150,4 +150,4 @@ DEF_GM(return new MatrixConvolutionGM(0xFFFF0000, 0xFF00FF00, KernelFixture::kBa
 DEF_GM(return new MatrixConvolutionGM(0xFFFFFFFF, 0x40404040, KernelFixture::kLarge_KernelFixture, "_big");)
 DEF_GM(return new MatrixConvolutionGM(0xFFFF0000, 0xFF00FF00, KernelFixture::kLarge_KernelFixture, "_big_color");)
 
-}
+}  // namespace skiagm

gm/mixedtextblobs.cpp

@@ -166,4 +166,4 @@ private:
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new MixedTextBlobsGM;)
-}
+}  // namespace skiagm

gm/modecolorfilters.cpp

@@ -169,4 +169,4 @@ private:
 
 DEF_GM( return new ModeColorFilterGM; )
 
-}
+}  // namespace skiagm

gm/morphology.cpp

@@ -100,4 +100,4 @@ private:
 
 DEF_GM(return new MorphologyGM;)
 
-}
+}  // namespace skiagm

gm/nested.cpp

@@ -147,4 +147,4 @@ DEF_GM( return new NestedGM(/* doAA = */ false, /* flipped = */ false); )
 DEF_GM( return new NestedGM(/* doAA = */ true,  /* flipped = */ true); )
 DEF_GM( return new NestedGM(/* doAA = */ false, /* flipped = */ true); )
 
-}
+}  // namespace skiagm

gm/nonclosedpaths.cpp

@@ -148,4 +148,4 @@ private:
 
 DEF_GM(return new NonClosedPathsGM;)
 
-}
+}  // namespace skiagm

gm/ovals.cpp

@@ -308,4 +308,4 @@ private:
 
 DEF_GM( return new OvalGM; )
 
-}
+}  // namespace skiagm

gm/patheffects.cpp

@@ -176,7 +176,7 @@ private:
 
 DEF_GM( return new PathEffectGM; )
 
-}
+}  // namespace skiagm
 
 //////////////////////////////////////////////////////////////////////////////
 

gm/pathopsinverse.cpp

@@ -117,7 +117,7 @@ private:
 
 DEF_GM( return new PathOpsInverseGM; )
 
-}
+}  // namespace skiagm
 
 #include "include/pathops/SkPathOps.h"
 #include "include/utils/SkParsePath.h"

gm/perspshaders.cpp

@@ -181,7 +181,7 @@ private:
 };
 DEF_GM(return new PerspShadersGM(true);)
 DEF_GM(return new PerspShadersGM(false);)
-}
+}  // namespace skiagm
 
 //////////////////////////////////////////////////////////////////////////////
 

gm/points.cpp

@@ -79,4 +79,4 @@ private:
 
 DEF_GM( return new PointsGM; )
 
-}
+}  // namespace skiagm

gm/polygonoffset.cpp

@@ -413,7 +413,7 @@ const size_t gSimpleSizes[] = {
 };
 static_assert(SK_ARRAY_COUNT(gSimpleSizes) == SK_ARRAY_COUNT(gSimplePoints), "array_mismatch");
 
-}
+}  // namespace PolygonOffsetData
 
 namespace skiagm {
 
@@ -623,4 +623,4 @@ private:
 
 DEF_GM(return new PolygonOffsetGM(true);)
 DEF_GM(return new PolygonOffsetGM(false);)
-}
+}  // namespace skiagm

gm/polygons.cpp

@@ -172,4 +172,4 @@ private:
 
 DEF_GM(return new PolygonsGM;)
 
-}
+}  // namespace skiagm

gm/preservefillrule.cpp

@@ -151,4 +151,4 @@ private:
 DEF_GM( return new PreserveFillRuleGM(true); )
 DEF_GM( return new PreserveFillRuleGM(false); )
 
-}
+}  // namespace skiagm

gm/quadpaths.cpp

@@ -288,4 +288,4 @@ DEF_GM( return new QuadPathGM; )
 
 DEF_GM( return new QuadClosePathGM; )
 
-}
+}  // namespace skiagm

gm/rectangletexture.cpp

@@ -261,5 +261,5 @@ private:
 };
 
 DEF_GM(return new RectangleTexture;)
-}
+}  // namespace skiagm
 #endif