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>
diff --git a/gm/androidblendmodes.cpp b/gm/androidblendmodes.cpp
index 1be3c1d..77003fb 100644
--- a/gm/androidblendmodes.cpp
+++ b/gm/androidblendmodes.cpp
@@ -133,4 +133,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new AndroidBlendModesGM;)
-}
+} // namespace skiagm
diff --git a/gm/anisotropic.cpp b/gm/anisotropic.cpp
index 1eb99d5..2304e51 100644
--- a/gm/anisotropic.cpp
+++ b/gm/anisotropic.cpp
@@ -121,4 +121,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new AnisotropicGM;)
-}
+} // namespace skiagm
diff --git a/gm/arcofzorro.cpp b/gm/arcofzorro.cpp
index 225bb0d..1eccca3 100644
--- a/gm/arcofzorro.cpp
+++ b/gm/arcofzorro.cpp
@@ -87,4 +87,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ArcOfZorroGM;)
-}
+} // namespace skiagm
diff --git a/gm/bc1_transparency.cpp b/gm/bc1_transparency.cpp
index 46c489d..a841433 100644
--- a/gm/bc1_transparency.cpp
+++ b/gm/bc1_transparency.cpp
@@ -216,4 +216,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new BC1TransparencyGM;)
-}
+} // namespace skiagm
diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp
index 0109699..4b7c839 100644
--- a/gm/beziereffects.cpp
+++ b/gm/beziereffects.cpp
@@ -502,4 +502,4 @@
DEF_GM(return new BezierConicEffects;)
DEF_GM(return new BezierQuadEffects;)
-}
+} // namespace skiagm
diff --git a/gm/bigblurs.cpp b/gm/bigblurs.cpp
index 6436c85..95f97ff 100644
--- a/gm/bigblurs.cpp
+++ b/gm/bigblurs.cpp
@@ -121,4 +121,4 @@
};
DEF_GM(return new BigBlursGM;)
-}
+} // namespace skiagm
diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp
index 4ef31c5..2b106d7 100644
--- a/gm/bigrrectaaeffect.cpp
+++ b/gm/bigrrectaaeffect.cpp
@@ -141,4 +141,4 @@
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
diff --git a/gm/bigtileimagefilter.cpp b/gm/bigtileimagefilter.cpp
index 67f9762..918fe9f 100644
--- a/gm/bigtileimagefilter.cpp
+++ b/gm/bigtileimagefilter.cpp
@@ -118,4 +118,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new BigTileImageFilterGM;)
-}
+} // namespace skiagm
diff --git a/gm/bitmapimage.cpp b/gm/bitmapimage.cpp
index e879445..52a16dc 100644
--- a/gm/bitmapimage.cpp
+++ b/gm/bitmapimage.cpp
@@ -86,4 +86,4 @@
DEF_GM( return new BitmapImageGM; )
-}
+} // namespace skiagm
diff --git a/gm/bitmappremul.cpp b/gm/bitmappremul.cpp
index af3e3be..bd6ff87 100644
--- a/gm/bitmappremul.cpp
+++ b/gm/bitmappremul.cpp
@@ -115,4 +115,4 @@
};
DEF_GM( return new BitmapPremulGM; )
-}
+} // namespace skiagm
diff --git a/gm/bitmapshader.cpp b/gm/bitmapshader.cpp
index dd9f908..c0149f1 100644
--- a/gm/bitmapshader.cpp
+++ b/gm/bitmapshader.cpp
@@ -146,4 +146,4 @@
DEF_GM( return new BitmapShaderGM; )
-}
+} // namespace skiagm
diff --git a/gm/blurredclippedcircle.cpp b/gm/blurredclippedcircle.cpp
index 747dae0..9f7c969 100644
--- a/gm/blurredclippedcircle.cpp
+++ b/gm/blurredclippedcircle.cpp
@@ -96,4 +96,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new BlurredClippedCircleGM;)
-}
+} // namespace skiagm
diff --git a/gm/circles.cpp b/gm/circles.cpp
index bec7d6b..644f7ff 100644
--- a/gm/circles.cpp
+++ b/gm/circles.cpp
@@ -211,4 +211,4 @@
DEF_GM( return new CircleGM; )
-}
+} // namespace skiagm
diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp
index 3f96c3b..a61d291 100644
--- a/gm/clockwise.cpp
+++ b/gm/clockwise.cpp
@@ -299,4 +299,4 @@
DEF_GM( return new ClockwiseGM(); )
-}
+} // namespace
diff --git a/gm/collapsepaths.cpp b/gm/collapsepaths.cpp
index 3899945..6b71432 100644
--- a/gm/collapsepaths.cpp
+++ b/gm/collapsepaths.cpp
@@ -141,7 +141,7 @@
canvas->drawPath(path.detach(), paint);
}
-};
+} // namespace
DEF_SIMPLE_GM(collapsepaths, canvas, 500, 600) {
SkPaint paint;
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp
index 7b35a24..d5d825f 100644
--- a/gm/coloremoji.cpp
+++ b/gm/coloremoji.cpp
@@ -198,4 +198,4 @@
DEF_GM(return new ColorEmojiGM;)
-}
+} // namespace skiagm
diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp
index 9960845..5bdec62 100644
--- a/gm/complexclip.cpp
+++ b/gm/complexclip.cpp
@@ -207,7 +207,7 @@
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 @@
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),
diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index 4465cd1..aef135e 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -224,4 +224,4 @@
DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kRRect_Clip, true); )
DEF_GM( return new ComplexClip2GM(ComplexClip2GM::kPath_Clip, true); )
-}
+} // namespace skiagm
diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp
index 3c160e0..e08cd1b 100644
--- a/gm/complexclip3.cpp
+++ b/gm/complexclip3.cpp
@@ -138,4 +138,4 @@
DEF_GM( return new ComplexClip3GM(true); )
// Complex clip first
DEF_GM( return new ComplexClip3GM(false); )
-}
+} // namespace skiagm
diff --git a/gm/complexclip4.cpp b/gm/complexclip4.cpp
index 2709e2e..24be22a 100644
--- a/gm/complexclip4.cpp
+++ b/gm/complexclip4.cpp
@@ -134,4 +134,4 @@
DEF_GM(return new ComplexClip4GM(false);)
DEF_GM(return new ComplexClip4GM(true);)
-}
+} // namespace skiagm
diff --git a/gm/complexclip_blur_tiled.cpp b/gm/complexclip_blur_tiled.cpp
index 4d32081..330458c 100644
--- a/gm/complexclip_blur_tiled.cpp
+++ b/gm/complexclip_blur_tiled.cpp
@@ -75,4 +75,4 @@
DEF_GM(return new ComplexClipBlurTiledGM;)
-}
+} // namespace skiagm
diff --git a/gm/concavepaths.cpp b/gm/concavepaths.cpp
index 27e32bc..8908a84 100644
--- a/gm/concavepaths.cpp
+++ b/gm/concavepaths.cpp
@@ -361,7 +361,7 @@
canvas->restore();
}
-};
+} // namespace
DEF_SIMPLE_GM(concavepaths, canvas, 500, 600) {
SkPaint paint;
diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp
index 1863fb9..bf3d6a1 100644
--- a/gm/constcolorprocessor.cpp
+++ b/gm/constcolorprocessor.cpp
@@ -220,4 +220,4 @@
DEF_GM(return new ColorProcessor{ColorProcessor::TestMode::kModulateRGBA};)
DEF_GM(return new ColorProcessor{ColorProcessor::TestMode::kModulateAlpha};)
-}
+} // namespace skiagm
diff --git a/gm/convex_all_line_paths.cpp b/gm/convex_all_line_paths.cpp
index 95f6e3a..582d32f 100644
--- a/gm/convex_all_line_paths.cpp
+++ b/gm/convex_all_line_paths.cpp
@@ -161,7 +161,7 @@
SK_ARRAY_COUNT(gPoints10),
};
static_assert(SK_ARRAY_COUNT(gSizes) == SK_ARRAY_COUNT(gPoints), "array_mismatch");
-}
+} // namespace ConvexLineOnlyData
namespace skiagm {
@@ -412,4 +412,4 @@
DEF_GM(return new ConvexLineOnlyPathsGM(false);)
DEF_GM(return new ConvexLineOnlyPathsGM(true);)
-}
+} // namespace skiagm
diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp
index 7298a95..f2ea645 100644
--- a/gm/convexpolyclip.cpp
+++ b/gm/convexpolyclip.cpp
@@ -313,4 +313,4 @@
};
DEF_GM(return new ConvexPolyClip;)
-}
+} // namespace skiagm
diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp
index 88d87aa..9d4c852 100644
--- a/gm/convexpolyeffect.cpp
+++ b/gm/convexpolyeffect.cpp
@@ -206,4 +206,4 @@
};
DEF_GM(return new ConvexPolyEffect;)
-}
+} // namespace skiagm
diff --git a/gm/croppedrects.cpp b/gm/croppedrects.cpp
index 0ab1257..96950fe 100644
--- a/gm/croppedrects.cpp
+++ b/gm/croppedrects.cpp
@@ -115,4 +115,4 @@
DEF_GM( return new CroppedRectsGM(); )
-}
+} // namespace skiagm
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp
index f96d049..3644138 100644
--- a/gm/degeneratesegments.cpp
+++ b/gm/degeneratesegments.cpp
@@ -370,4 +370,4 @@
DEF_GM( return new DegenerateSegmentsGM; )
-}
+} // namespace skiagm
diff --git a/gm/discard.cpp b/gm/discard.cpp
index 0febb5d..b092a59 100644
--- a/gm/discard.cpp
+++ b/gm/discard.cpp
@@ -99,4 +99,4 @@
DEF_GM(return new DiscardGM;)
-} // end namespace
+} // namespace skiagm
diff --git a/gm/displacement.cpp b/gm/displacement.cpp
index 0261199..51ab5a3 100644
--- a/gm/displacement.cpp
+++ b/gm/displacement.cpp
@@ -171,4 +171,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new DisplacementMapGM;)
-}
+} // namespace skiagm
diff --git a/gm/distantclip.cpp b/gm/distantclip.cpp
index b0da264..1e50bbd 100644
--- a/gm/distantclip.cpp
+++ b/gm/distantclip.cpp
@@ -65,4 +65,4 @@
DEF_GM( return new DistantClipGM; )
-}
+} // namespace skiagm
diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp
index 1737009..423588b 100644
--- a/gm/dstreadshuffle.cpp
+++ b/gm/dstreadshuffle.cpp
@@ -200,4 +200,4 @@
DEF_GM( return new DstReadShuffle; )
-}
+} // namespace skiagm
diff --git a/gm/emptypath.cpp b/gm/emptypath.cpp
index 154ece5..7d5603a 100644
--- a/gm/emptypath.cpp
+++ b/gm/emptypath.cpp
@@ -185,4 +185,4 @@
};
DEF_GM( return new EmptyStrokeGM; )
-}
+} // namespace skiagm
diff --git a/gm/encode.cpp b/gm/encode.cpp
index 7776446..79688b1 100644
--- a/gm/encode.cpp
+++ b/gm/encode.cpp
@@ -55,7 +55,7 @@
};
DEF_GM( return new EncodeGM; )
-}
+} // namespace skiagm
///////////
diff --git a/gm/encode_alpha_jpeg.cpp b/gm/encode_alpha_jpeg.cpp
index 8fc0241..b738690 100644
--- a/gm/encode_alpha_jpeg.cpp
+++ b/gm/encode_alpha_jpeg.cpp
@@ -108,4 +108,4 @@
DEF_GM( return new EncodeJpegAlphaOptsGM; )
-};
+} // namespace skiagm
diff --git a/gm/encode_color_types.cpp b/gm/encode_color_types.cpp
index d496ae8..b814830 100644
--- a/gm/encode_color_types.cpp
+++ b/gm/encode_color_types.cpp
@@ -167,4 +167,4 @@
DEF_VARIANTS(SkEncodedImageFormat::kWEBP, 100, "webp-lossless")
DEF_VARIANTS(SkEncodedImageFormat::kWEBP, 80, "webp-lossy")
-}
+} // namespace skiagm
diff --git a/gm/encode_platform.cpp b/gm/encode_platform.cpp
index f636cb9..cb177fe 100644
--- a/gm/encode_platform.cpp
+++ b/gm/encode_platform.cpp
@@ -131,4 +131,4 @@
};
DEF_GM( return new EncodePlatformGM; )
-}
+} // namespace skiagm
diff --git a/gm/encode_srgb.cpp b/gm/encode_srgb.cpp
index 380bb7f..d707b8c 100644
--- a/gm/encode_srgb.cpp
+++ b/gm/encode_srgb.cpp
@@ -150,4 +150,4 @@
DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kPNG); )
DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kWEBP); )
DEF_GM( return new EncodeSRGBGM(SkEncodedImageFormat::kJPEG); )
-}
+} // namespace skiagm
diff --git a/gm/exoticformats.cpp b/gm/exoticformats.cpp
index ce49676..9cd1925 100644
--- a/gm/exoticformats.cpp
+++ b/gm/exoticformats.cpp
@@ -440,4 +440,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ExoticFormatsGM;)
-}
+} // namespace skiagm
diff --git a/gm/extractbitmap.cpp b/gm/extractbitmap.cpp
index 97d724d..6809057 100644
--- a/gm/extractbitmap.cpp
+++ b/gm/extractbitmap.cpp
@@ -84,4 +84,4 @@
DEF_GM( return new ExtractBitmapGM; )
-}
+} // namespace skiagm
diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp
index f8d74da..5aaa50e 100644
--- a/gm/filltypes.cpp
+++ b/gm/filltypes.cpp
@@ -99,4 +99,4 @@
DEF_GM( return new FillTypeGM; )
-}
+} // namespace skiagm
diff --git a/gm/filltypespersp.cpp b/gm/filltypespersp.cpp
index b3d9caa..c396fb8 100644
--- a/gm/filltypespersp.cpp
+++ b/gm/filltypespersp.cpp
@@ -139,4 +139,4 @@
DEF_GM( return new FillTypePerspGM; )
-}
+} // namespace skiagm
diff --git a/gm/filterfastbounds.cpp b/gm/filterfastbounds.cpp
index 7da526c..c03c25d 100644
--- a/gm/filterfastbounds.cpp
+++ b/gm/filterfastbounds.cpp
@@ -325,4 +325,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ImageFilterFastBoundGM;)
-}
+} // namespace skiagm
diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp
index 8ae63dd..a27f223 100644
--- a/gm/fontscaler.cpp
+++ b/gm/fontscaler.cpp
@@ -85,4 +85,4 @@
DEF_GM( return new FontScalerGM; )
-}
+} // namespace skiagm
diff --git a/gm/fontscalerdistortable.cpp b/gm/fontscalerdistortable.cpp
index 6d6c16c..c0e4e15 100644
--- a/gm/fontscalerdistortable.cpp
+++ b/gm/fontscalerdistortable.cpp
@@ -140,4 +140,4 @@
DEF_GM( return new FontScalerDistortableGM; )
-}
+} // namespace skiagm
diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp
index 44be209..a73944f 100644
--- a/gm/fwidth_squircle.cpp
+++ b/gm/fwidth_squircle.cpp
@@ -263,4 +263,4 @@
return skiagm::DrawResult::kOk;
}
-}
+} // namespace skiagm
diff --git a/gm/gm.h b/gm/gm.h
index bec5fe6..76fa92e 100644
--- a/gm/gm.h
+++ b/gm/gm.h
@@ -251,7 +251,7 @@
const SkISize fSize;
const DrawProc fDrawProc;
};
-}
+} // namespace skiagm
void MarkGMGood(SkCanvas*, SkScalar x, SkScalar y);
void MarkGMBad (SkCanvas*, SkScalar x, SkScalar y);
diff --git a/gm/gradients_2pt_conical.cpp b/gm/gradients_2pt_conical.cpp
index 648022c..dfb7418 100644
--- a/gm/gradients_2pt_conical.cpp
+++ b/gm/gradients_2pt_conical.cpp
@@ -407,4 +407,4 @@
DEF_GM( return new ConicalGradientsGM(kOutside_GradCaseType, false); )
DEF_GM( return new ConicalGradientsGM(kEdge_GradCaseType, false); )
-}
+} // namespace skiagm
diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp
index f631d72..15906e5 100644
--- a/gm/hairlines.cpp
+++ b/gm/hairlines.cpp
@@ -299,4 +299,4 @@
DEF_GM( return new HairlinesGM; )
-}
+} // namespace skiagm
diff --git a/gm/hairmodes.cpp b/gm/hairmodes.cpp
index e05ca92..80a2098 100644
--- a/gm/hairmodes.cpp
+++ b/gm/hairmodes.cpp
@@ -132,4 +132,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM( return new HairModesGM; )
-}
+} // namespace skiagm
diff --git a/gm/imageblurclampmode.cpp b/gm/imageblurclampmode.cpp
index 06ce313..e6d5d98 100644
--- a/gm/imageblurclampmode.cpp
+++ b/gm/imageblurclampmode.cpp
@@ -111,4 +111,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ImageBlurClampModeGM;)
-}
+} // namespace skiagm
diff --git a/gm/imageblurrepeatmode.cpp b/gm/imageblurrepeatmode.cpp
index 8f8d257..7a6cff8 100644
--- a/gm/imageblurrepeatmode.cpp
+++ b/gm/imageblurrepeatmode.cpp
@@ -125,7 +125,7 @@
//////////////////////////////////////////////////////////////////////////////
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:
diff --git a/gm/imageblurtiled.cpp b/gm/imageblurtiled.cpp
index 565d137..0e36607 100644
--- a/gm/imageblurtiled.cpp
+++ b/gm/imageblurtiled.cpp
@@ -78,4 +78,4 @@
DEF_GM(return new ImageBlurTiledGM(3.0f, 3.0f);)
-}
+} // namespace skiagm
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index 9a240af..4b6d90b 100644
--- a/gm/imagefiltersbase.cpp
+++ b/gm/imagefiltersbase.cpp
@@ -85,7 +85,7 @@
SK_REGISTER_FLATTENABLE(FailImageFilter);
}
} initializer;
-}
+} // namespace
sk_sp<SkFlattenable> IdentityImageFilter::CreateProc(SkReadBuffer& buffer) {
SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp
index df48c00..f861e39 100644
--- a/gm/imagefiltersclipped.cpp
+++ b/gm/imagefiltersclipped.cpp
@@ -156,4 +156,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ImageFiltersClippedGM;)
-}
+} // namespace skiagm
diff --git a/gm/imagefilterscropexpand.cpp b/gm/imagefilterscropexpand.cpp
index 18cddb6..7362ebf 100644
--- a/gm/imagefilterscropexpand.cpp
+++ b/gm/imagefilterscropexpand.cpp
@@ -33,7 +33,7 @@
void draw(SkCanvas* canvas, const SkBitmap& bitmap, const SkIRect& rect,
sk_sp<SkImageFilter> filter);
-};
+} // namespace
///////////////////////////////////////////////////////////////////////////////
@@ -163,4 +163,4 @@
canvas->translate(SkIntToScalar(80), 0);
}
-};
+} // namespace
diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp
index df8dc1f..d84f106 100644
--- a/gm/imagefiltersscaled.cpp
+++ b/gm/imagefiltersscaled.cpp
@@ -162,4 +162,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ImageFiltersScaledGM;)
-}
+} // namespace skiagm
diff --git a/gm/imagefiltersstroked.cpp b/gm/imagefiltersstroked.cpp
index fc08a70..2270362 100644
--- a/gm/imagefiltersstroked.cpp
+++ b/gm/imagefiltersstroked.cpp
@@ -109,4 +109,4 @@
DEF_GM(return new ImageFiltersStrokedGM;)
-}
+} // namespace skiagm
diff --git a/gm/imagefilterstransformed.cpp b/gm/imagefilterstransformed.cpp
index bc91411..8d14474 100644
--- a/gm/imagefilterstransformed.cpp
+++ b/gm/imagefilterstransformed.cpp
@@ -123,7 +123,7 @@
typedef GM INHERITED;
};
DEF_GM( return new ImageFiltersTransformedGM; )
-}
+} // namespace skiagm
//////////////////////////////////////////////////////////////////////////////
diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp
index 89ed15c..a3920e4 100644
--- a/gm/imagefromyuvtextures.cpp
+++ b/gm/imagefromyuvtextures.cpp
@@ -335,4 +335,4 @@
};
DEF_GM(return new ImageFromYUVTextures;)
-}
+} // namespace skiagm
diff --git a/gm/imagemakewithfilter.cpp b/gm/imagemakewithfilter.cpp
index 7108ac9..10f5670 100644
--- a/gm/imagemakewithfilter.cpp
+++ b/gm/imagemakewithfilter.cpp
@@ -178,7 +178,7 @@
// 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
diff --git a/gm/imagemasksubset.cpp b/gm/imagemasksubset.cpp
index d0a3eff..d8f40ba 100644
--- a/gm/imagemasksubset.cpp
+++ b/gm/imagemasksubset.cpp
@@ -70,7 +70,7 @@
},
};
-} // anonymous ns
+} // namespace
// Checks whether subset SkImages preserve the original color type (A8 in this case).
DEF_SIMPLE_GM(imagemasksubset, canvas, 480, 480) {
diff --git a/gm/imagesource2.cpp b/gm/imagesource2.cpp
index 4949ce7..9ddf807 100644
--- a/gm/imagesource2.cpp
+++ b/gm/imagesource2.cpp
@@ -99,4 +99,4 @@
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
diff --git a/gm/jpg_color_cube.cpp b/gm/jpg_color_cube.cpp
index 50db941..6ed782b 100644
--- a/gm/jpg_color_cube.cpp
+++ b/gm/jpg_color_cube.cpp
@@ -69,4 +69,4 @@
};
DEF_GM( return new ColorCubeGM; )
-}
+} // namespace skiagm
diff --git a/gm/lcdblendmodes.cpp b/gm/lcdblendmodes.cpp
index 4741cbf..f6c5a01 100644
--- a/gm/lcdblendmodes.cpp
+++ b/gm/lcdblendmodes.cpp
@@ -152,4 +152,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM( return new LcdBlendGM; )
-}
+} // namespace skiagm
diff --git a/gm/lcdoverlap.cpp b/gm/lcdoverlap.cpp
index 8a91efa..8470fd6 100644
--- a/gm/lcdoverlap.cpp
+++ b/gm/lcdoverlap.cpp
@@ -97,4 +97,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM( return new LcdOverlapGM; )
-}
+} // namespace skiagm
diff --git a/gm/lighting.cpp b/gm/lighting.cpp
index cc85181..f47c85d 100644
--- a/gm/lighting.cpp
+++ b/gm/lighting.cpp
@@ -153,4 +153,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ImageLightingGM;)
-}
+} // namespace skiagm
diff --git a/gm/mandoline.cpp b/gm/mandoline.cpp
index 6f943fc..9a0f6ca 100644
--- a/gm/mandoline.cpp
+++ b/gm/mandoline.cpp
@@ -198,4 +198,4 @@
DEF_GM(return new SliverPathsGM;)
-}
+} // namespace skiagm
diff --git a/gm/manypaths.cpp b/gm/manypaths.cpp
index 660ad68..4f6fca3 100644
--- a/gm/manypaths.cpp
+++ b/gm/manypaths.cpp
@@ -125,4 +125,4 @@
DEF_GM( return new ManyCirclesGM; )
DEF_GM( return new ManyRRectsGM; )
-}
+} // namespace skiagm
diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp
index 94fc8b3..006d14e 100644
--- a/gm/matrixconvolution.cpp
+++ b/gm/matrixconvolution.cpp
@@ -150,4 +150,4 @@
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
diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp
index ab78412..4f0107a 100644
--- a/gm/mixedtextblobs.cpp
+++ b/gm/mixedtextblobs.cpp
@@ -166,4 +166,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new MixedTextBlobsGM;)
-}
+} // namespace skiagm
diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp
index ffffa60..a4dac43 100644
--- a/gm/modecolorfilters.cpp
+++ b/gm/modecolorfilters.cpp
@@ -169,4 +169,4 @@
DEF_GM( return new ModeColorFilterGM; )
-}
+} // namespace skiagm
diff --git a/gm/morphology.cpp b/gm/morphology.cpp
index d23fca5..6841e41 100644
--- a/gm/morphology.cpp
+++ b/gm/morphology.cpp
@@ -100,4 +100,4 @@
DEF_GM(return new MorphologyGM;)
-}
+} // namespace skiagm
diff --git a/gm/nested.cpp b/gm/nested.cpp
index 9c1370c..81b92f2 100644
--- a/gm/nested.cpp
+++ b/gm/nested.cpp
@@ -147,4 +147,4 @@
DEF_GM( return new NestedGM(/* doAA = */ true, /* flipped = */ true); )
DEF_GM( return new NestedGM(/* doAA = */ false, /* flipped = */ true); )
-}
+} // namespace skiagm
diff --git a/gm/nonclosedpaths.cpp b/gm/nonclosedpaths.cpp
index 0f7b081..168b2fc 100644
--- a/gm/nonclosedpaths.cpp
+++ b/gm/nonclosedpaths.cpp
@@ -148,4 +148,4 @@
DEF_GM(return new NonClosedPathsGM;)
-}
+} // namespace skiagm
diff --git a/gm/ovals.cpp b/gm/ovals.cpp
index b7cb6b5..49e1e2d 100644
--- a/gm/ovals.cpp
+++ b/gm/ovals.cpp
@@ -308,4 +308,4 @@
DEF_GM( return new OvalGM; )
-}
+} // namespace skiagm
diff --git a/gm/patheffects.cpp b/gm/patheffects.cpp
index 0ee508d..a9dde26 100644
--- a/gm/patheffects.cpp
+++ b/gm/patheffects.cpp
@@ -176,7 +176,7 @@
DEF_GM( return new PathEffectGM; )
-}
+} // namespace skiagm
//////////////////////////////////////////////////////////////////////////////
diff --git a/gm/pathopsinverse.cpp b/gm/pathopsinverse.cpp
index 7c74956..23676e3 100644
--- a/gm/pathopsinverse.cpp
+++ b/gm/pathopsinverse.cpp
@@ -117,7 +117,7 @@
DEF_GM( return new PathOpsInverseGM; )
-}
+} // namespace skiagm
#include "include/pathops/SkPathOps.h"
#include "include/utils/SkParsePath.h"
diff --git a/gm/perspshaders.cpp b/gm/perspshaders.cpp
index 881f34c..fcd9db5 100644
--- a/gm/perspshaders.cpp
+++ b/gm/perspshaders.cpp
@@ -181,7 +181,7 @@
};
DEF_GM(return new PerspShadersGM(true);)
DEF_GM(return new PerspShadersGM(false);)
-}
+} // namespace skiagm
//////////////////////////////////////////////////////////////////////////////
diff --git a/gm/points.cpp b/gm/points.cpp
index 6dd0dcb..a6a76eb 100644
--- a/gm/points.cpp
+++ b/gm/points.cpp
@@ -79,4 +79,4 @@
DEF_GM( return new PointsGM; )
-}
+} // namespace skiagm
diff --git a/gm/polygonoffset.cpp b/gm/polygonoffset.cpp
index 99ce47f..fe703a1 100644
--- a/gm/polygonoffset.cpp
+++ b/gm/polygonoffset.cpp
@@ -413,7 +413,7 @@
};
static_assert(SK_ARRAY_COUNT(gSimpleSizes) == SK_ARRAY_COUNT(gSimplePoints), "array_mismatch");
-}
+} // namespace PolygonOffsetData
namespace skiagm {
@@ -623,4 +623,4 @@
DEF_GM(return new PolygonOffsetGM(true);)
DEF_GM(return new PolygonOffsetGM(false);)
-}
+} // namespace skiagm
diff --git a/gm/polygons.cpp b/gm/polygons.cpp
index 42bf677..594d6d2 100644
--- a/gm/polygons.cpp
+++ b/gm/polygons.cpp
@@ -172,4 +172,4 @@
DEF_GM(return new PolygonsGM;)
-}
+} // namespace skiagm
diff --git a/gm/preservefillrule.cpp b/gm/preservefillrule.cpp
index e3fbb95..fdb5eb3 100644
--- a/gm/preservefillrule.cpp
+++ b/gm/preservefillrule.cpp
@@ -151,4 +151,4 @@
DEF_GM( return new PreserveFillRuleGM(true); )
DEF_GM( return new PreserveFillRuleGM(false); )
-}
+} // namespace skiagm
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp
index 8570934..408d6c1 100644
--- a/gm/quadpaths.cpp
+++ b/gm/quadpaths.cpp
@@ -288,4 +288,4 @@
DEF_GM( return new QuadClosePathGM; )
-}
+} // namespace skiagm
diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp
index e316f6b..ba23724 100644
--- a/gm/rectangletexture.cpp
+++ b/gm/rectangletexture.cpp
@@ -261,5 +261,5 @@
};
DEF_GM(return new RectangleTexture;)
-}
+} // namespace skiagm
#endif
diff --git a/gm/rects.cpp b/gm/rects.cpp
index 0630a15..bf69763 100644
--- a/gm/rects.cpp
+++ b/gm/rects.cpp
@@ -302,4 +302,4 @@
DEF_GM( return new RectsGM; )
-}
+} // namespace skiagm
diff --git a/gm/resizeimagefilter.cpp b/gm/resizeimagefilter.cpp
index af278b0..8fd6ddd 100644
--- a/gm/resizeimagefilter.cpp
+++ b/gm/resizeimagefilter.cpp
@@ -116,4 +116,4 @@
DEF_GM(return new ResizeGM; )
-}
+} // namespace skiagm
diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp
index 6a984b3..4f4a8cb 100644
--- a/gm/roundrects.cpp
+++ b/gm/roundrects.cpp
@@ -382,4 +382,4 @@
DEF_GM( return new RoundRectGM; )
-}
+} // namespace skiagm
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index e7a3760..f23973f 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -270,4 +270,4 @@
DEF_GM( return new RRectGM(RRectGM::kBW_Clip_Type); )
DEF_GM( return new RRectGM(RRectGM::kEffect_Type); )
-}
+} // namespace skiagm
diff --git a/gm/samplelocations.cpp b/gm/samplelocations.cpp
index 2c2b411..e2cf0ac 100644
--- a/gm/samplelocations.cpp
+++ b/gm/samplelocations.cpp
@@ -389,4 +389,4 @@
DEF_GM( return new SampleLocationsGM(GradType::kSW, kTopLeft_GrSurfaceOrigin); )
DEF_GM( return new SampleLocationsGM(GradType::kSW, kBottomLeft_GrSurfaceOrigin); )
-}
+} // namespace skiagm
diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp
index 1d5a241..d4af469 100644
--- a/gm/samplerstress.cpp
+++ b/gm/samplerstress.cpp
@@ -149,4 +149,4 @@
DEF_GM( return new SamplerStressGM; )
-}
+} // namespace skiagm
diff --git a/gm/scaledemoji.cpp b/gm/scaledemoji.cpp
index 9ef5627..f9fc91c 100644
--- a/gm/scaledemoji.cpp
+++ b/gm/scaledemoji.cpp
@@ -150,4 +150,4 @@
DEF_GM(return new ScaledEmojiGM;)
DEF_GM(return new ScaledEmojiPosGM;)
-}
+} // namespace skiagm
diff --git a/gm/scaledemoji_rendering.cpp b/gm/scaledemoji_rendering.cpp
index dd645bd..cf2407d 100644
--- a/gm/scaledemoji_rendering.cpp
+++ b/gm/scaledemoji_rendering.cpp
@@ -79,4 +79,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ScaledEmojiRenderingGM;)
-}
+} // namespace skiagm
diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp
index 4eadad9..864ee66 100644
--- a/gm/shadertext3.cpp
+++ b/gm/shadertext3.cpp
@@ -143,4 +143,4 @@
///////////////////////////////////////////////////////////////////////////////
DEF_GM( return new ShaderText3GM; )
-}
+} // namespace skiagm
diff --git a/gm/shapes.cpp b/gm/shapes.cpp
index 33fc99a..ddeb842 100644
--- a/gm/shapes.cpp
+++ b/gm/shapes.cpp
@@ -171,4 +171,4 @@
DEF_GM( return new InnerShapesGM(true); )
DEF_GM( return new InnerShapesGM(false); )
-}
+} // namespace skiagm
diff --git a/gm/sharedcorners.cpp b/gm/sharedcorners.cpp
index 5c9b270..aadf896 100644
--- a/gm/sharedcorners.cpp
+++ b/gm/sharedcorners.cpp
@@ -163,4 +163,4 @@
DEF_GM(return new SharedCornersGM;)
-}
+} // namespace skiagm
diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp
index 9267b7c..3b28652 100644
--- a/gm/simpleaaclip.cpp
+++ b/gm/simpleaaclip.cpp
@@ -207,4 +207,4 @@
DEF_GM( return new SimpleClipGM(SimpleClipGM::kPath_GeomType); )
DEF_GM( return new SimpleClipGM(SimpleClipGM::kAAClip_GeomType); )
-}
+} // namespace skiagm
diff --git a/gm/stlouisarch.cpp b/gm/stlouisarch.cpp
index 106c47b..1e348cb 100644
--- a/gm/stlouisarch.cpp
+++ b/gm/stlouisarch.cpp
@@ -98,4 +98,4 @@
DEF_GM( return new StLouisArchGM; )
-}
+} // namespace skiagm
diff --git a/gm/stroke_rect_shader.cpp b/gm/stroke_rect_shader.cpp
index 596d879..1e97014 100644
--- a/gm/stroke_rect_shader.cpp
+++ b/gm/stroke_rect_shader.cpp
@@ -70,4 +70,4 @@
}
}
-}
+} // namespace skiagm
diff --git a/gm/strokedlines.cpp b/gm/strokedlines.cpp
index cf1cbab..50af641 100644
--- a/gm/strokedlines.cpp
+++ b/gm/strokedlines.cpp
@@ -238,4 +238,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new StrokedLinesGM;)
-}
+} // namespace skiagm
diff --git a/gm/strokerects.cpp b/gm/strokerects.cpp
index 402f65a..2f1637e 100644
--- a/gm/strokerects.cpp
+++ b/gm/strokerects.cpp
@@ -83,4 +83,4 @@
DEF_GM( return new StrokeRectsGM; )
-}
+} // namespace skiagm
diff --git a/gm/stroketext.cpp b/gm/stroketext.cpp
index 3705108..4c2baa1 100644
--- a/gm/stroketext.cpp
+++ b/gm/stroketext.cpp
@@ -79,7 +79,7 @@
kBelowThreshold_TextSize = 255,
kAboveThreshold_TextSize = 257
};
-}
+} // namespace
DEF_SIMPLE_GM(stroketext, canvas, 1200, 480) {
if (true) { test_nulldev(canvas); }
diff --git a/gm/tessellation.cpp b/gm/tessellation.cpp
index 3e515c9..40709ec 100644
--- a/gm/tessellation.cpp
+++ b/gm/tessellation.cpp
@@ -413,4 +413,4 @@
DEF_GM( return new TessellationGM(); )
-}
+} // namespace skiagm
diff --git a/gm/texelsubset.cpp b/gm/texelsubset.cpp
index 52fa58d..97766f7 100644
--- a/gm/texelsubset.cpp
+++ b/gm/texelsubset.cpp
@@ -235,4 +235,4 @@
DEF_GM(return new TexelSubset(Filter::kNearest, MipmapMode::kLinear , false);)
DEF_GM(return new TexelSubset(Filter::kLinear , MipmapMode::kLinear , false);)
-}
+} // namespace skiagm
diff --git a/gm/textblob.cpp b/gm/textblob.cpp
index b79e579..4f482d8 100644
--- a/gm/textblob.cpp
+++ b/gm/textblob.cpp
@@ -76,7 +76,7 @@
};
const SkScalar kFontSize = 16;
-}
+} // namespace
class TextBlobGM : public skiagm::GM {
public:
diff --git a/gm/textblobblockreordering.cpp b/gm/textblobblockreordering.cpp
index f7b3c4f..b7a9cd8 100644
--- a/gm/textblobblockreordering.cpp
+++ b/gm/textblobblockreordering.cpp
@@ -99,4 +99,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TextBlobBlockReordering;)
-}
+} // namespace skiagm
diff --git a/gm/textblobcolortrans.cpp b/gm/textblobcolortrans.cpp
index b41dd23..4c8a105 100644
--- a/gm/textblobcolortrans.cpp
+++ b/gm/textblobcolortrans.cpp
@@ -103,4 +103,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TextBlobColorTrans;)
-}
+} // namespace skiagm
diff --git a/gm/textblobgeometrychange.cpp b/gm/textblobgeometrychange.cpp
index fa8ce82..3c3f062 100644
--- a/gm/textblobgeometrychange.cpp
+++ b/gm/textblobgeometrychange.cpp
@@ -78,4 +78,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TextBlobGeometryChange;)
-}
+} // namespace skiagm
diff --git a/gm/textbloblooper.cpp b/gm/textbloblooper.cpp
index 982e77f..31de25b 100644
--- a/gm/textbloblooper.cpp
+++ b/gm/textbloblooper.cpp
@@ -273,4 +273,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TextBlobLooperGM;)
-}
+} // namespace skiagm
diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp
index 6a5e291..124dca7 100644
--- a/gm/textblobmixedsizes.cpp
+++ b/gm/textblobmixedsizes.cpp
@@ -192,4 +192,4 @@
DEF_GM( return new TextBlobMixedSizes(false); )
DEF_GM( return new TextBlobMixedSizes(true); )
-}
+} // namespace skiagm
diff --git a/gm/textblobrandomfont.cpp b/gm/textblobrandomfont.cpp
index d8a2a30..57dbdc1 100644
--- a/gm/textblobrandomfont.cpp
+++ b/gm/textblobrandomfont.cpp
@@ -171,4 +171,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TextBlobRandomFont;)
-}
+} // namespace skiagm
diff --git a/gm/textblobtransforms.cpp b/gm/textblobtransforms.cpp
index d9ea8b4..335b74c 100644
--- a/gm/textblobtransforms.cpp
+++ b/gm/textblobtransforms.cpp
@@ -176,4 +176,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TextBlobTransforms;)
-}
+} // namespace skiagm
diff --git a/gm/textblobuseaftergpufree.cpp b/gm/textblobuseaftergpufree.cpp
index a1558b9..aa23381 100644
--- a/gm/textblobuseaftergpufree.cpp
+++ b/gm/textblobuseaftergpufree.cpp
@@ -67,4 +67,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TextBlobUseAfterGpuFree;)
-}
+} // namespace skiagm
diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp
index ed11db1..75ca5f3 100644
--- a/gm/texteffects.cpp
+++ b/gm/texteffects.cpp
@@ -104,7 +104,7 @@
return blobBuilder.make();
}
-} // anonymous ns
+} // namespace
DEF_SIMPLE_GM(fancyblobunderline, canvas, 1480, 1380) {
SkPaint paint;
diff --git a/gm/thinconcavepaths.cpp b/gm/thinconcavepaths.cpp
index 47b20d2..d7f1ac7 100644
--- a/gm/thinconcavepaths.cpp
+++ b/gm/thinconcavepaths.cpp
@@ -133,7 +133,7 @@
-};
+} // namespace
DEF_SIMPLE_GM(thinconcavepaths, canvas, 550, 400) {
SkPaint paint;
diff --git a/gm/thinrects.cpp b/gm/thinrects.cpp
index ad0ba7d..6e562f6 100644
--- a/gm/thinrects.cpp
+++ b/gm/thinrects.cpp
@@ -126,4 +126,4 @@
DEF_GM( return new ThinRectsGM; )
-}
+} // namespace skiagm
diff --git a/gm/thinstrokedrects.cpp b/gm/thinstrokedrects.cpp
index 085ec51..0e6743d 100644
--- a/gm/thinstrokedrects.cpp
+++ b/gm/thinstrokedrects.cpp
@@ -82,4 +82,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new ThinStrokedRectsGM;)
-}
+} // namespace skiagm
diff --git a/gm/tiledscaledbitmap.cpp b/gm/tiledscaledbitmap.cpp
index 0f28c1e..ae9744e 100644
--- a/gm/tiledscaledbitmap.cpp
+++ b/gm/tiledscaledbitmap.cpp
@@ -79,4 +79,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TiledScaledBitmapGM;)
-}
+} // namespace skiagm
diff --git a/gm/tileimagefilter.cpp b/gm/tileimagefilter.cpp
index f598b8a..2aee0be 100644
--- a/gm/tileimagefilter.cpp
+++ b/gm/tileimagefilter.cpp
@@ -147,4 +147,4 @@
//////////////////////////////////////////////////////////////////////////////
DEF_GM(return new TileImageFilterGM;)
-}
+} // namespace skiagm
diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp
index b2773cc..c708da2 100644
--- a/gm/tinybitmap.cpp
+++ b/gm/tinybitmap.cpp
@@ -33,6 +33,6 @@
canvas->drawPaint(paint);
}
};
-}
+} // namespace
DEF_GM( return new TinyBitmapGM; )
diff --git a/gm/verifiers/gmverifier.cpp b/gm/verifiers/gmverifier.cpp
index 8e725ff..6b7c3e9 100644
--- a/gm/verifiers/gmverifier.cpp
+++ b/gm/verifiers/gmverifier.cpp
@@ -127,5 +127,5 @@
return VerifierResult::Ok();
}
-}
-}
+} // namespace verifiers
+} // namespace skiagm
diff --git a/gm/verifiers/gmverifier.h b/gm/verifiers/gmverifier.h
index 0bbd7ff..2809936 100644
--- a/gm/verifiers/gmverifier.h
+++ b/gm/verifiers/gmverifier.h
@@ -188,7 +188,7 @@
bool needsGoldImage() const;
};
-}
-}
+} // namespace verifiers
+} // namespace skiagm
#endif
diff --git a/gm/wacky_yuv_formats.cpp b/gm/wacky_yuv_formats.cpp
index 4235019..d118c8c 100644
--- a/gm/wacky_yuv_formats.cpp
+++ b/gm/wacky_yuv_formats.cpp
@@ -1677,7 +1677,7 @@
DEF_GM(return new YUVMakeColorSpaceGM();)
-}
+} // namespace skiagm
///////////////
diff --git a/gm/windowrectangles.cpp b/gm/windowrectangles.cpp
index e721f37..b0e0c1e 100644
--- a/gm/windowrectangles.cpp
+++ b/gm/windowrectangles.cpp
@@ -304,4 +304,4 @@
DEF_GM( return new WindowRectanglesMaskGM(); )
-}
+} // namespace skiagm
diff --git a/gm/xfermodeimagefilter.cpp b/gm/xfermodeimagefilter.cpp
index 155d6a6..1f96dbb 100644
--- a/gm/xfermodeimagefilter.cpp
+++ b/gm/xfermodeimagefilter.cpp
@@ -225,4 +225,4 @@
DEF_GM( return new XfermodeImageFilterGM; );
-}
+} // namespace skiagm
diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp
index e5d3b1f..89f5e02 100644
--- a/gm/xfermodes2.cpp
+++ b/gm/xfermodes2.cpp
@@ -154,4 +154,4 @@
DEF_GM( return new Xfermodes2GM; )
-}
+} // namespace skiagm
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp
index 2977428..4ab9bf1 100644
--- a/gm/xfermodes3.cpp
+++ b/gm/xfermodes3.cpp
@@ -225,4 +225,4 @@
DEF_GM(return new Xfermodes3GM;)
-}
+} // namespace skiagm
diff --git a/gm/ycbcrimage.cpp b/gm/ycbcrimage.cpp
index 167c934..99985b1 100644
--- a/gm/ycbcrimage.cpp
+++ b/gm/ycbcrimage.cpp
@@ -115,6 +115,6 @@
DEF_GM(return new YCbCrImageGM;)
-} // skiagm
+} // namespace skiagm
#endif // SK_VULKAN
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp
index 7f5c81d..6613f40 100644
--- a/gm/yuvtorgbeffect.cpp
+++ b/gm/yuvtorgbeffect.cpp
@@ -384,4 +384,4 @@
};
DEF_GM(return new YUVtoRGBSubsetEffect;)
-}
+} // namespace skiagm