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/src/codec/SkCodecAnimationPriv.h b/src/codec/SkCodecAnimationPriv.h
index 233a79b..e326919 100644
--- a/src/codec/SkCodecAnimationPriv.h
+++ b/src/codec/SkCodecAnimationPriv.h
@@ -28,5 +28,5 @@
kBG,
};
-}
+} // namespace SkCodecAnimation
#endif // SkCodecAnimationPriv_DEFINED
diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h
index 60324c8..178ff27 100644
--- a/src/core/SkAdvancedTypefaceMetrics.h
+++ b/src/core/SkAdvancedTypefaceMetrics.h
@@ -68,6 +68,6 @@
namespace sknonstd {
template <> struct is_bitmask_enum<SkAdvancedTypefaceMetrics::FontFlags> : std::true_type {};
template <> struct is_bitmask_enum<SkAdvancedTypefaceMetrics::StyleFlags> : std::true_type {};
-}
+} // namespace sknonstd
#endif
diff --git a/src/core/SkBitmapCache.cpp b/src/core/SkBitmapCache.cpp
index 1cc5c19..abb4a12 100644
--- a/src/core/SkBitmapCache.cpp
+++ b/src/core/SkBitmapCache.cpp
@@ -50,7 +50,7 @@
const SkBitmapCacheDesc fDesc;
};
-}
+} // namespace
//////////////////////
#include "src/core/SkDiscardableMemory.h"
@@ -266,7 +266,7 @@
MipMapKey fKey;
const SkMipmap* fMipMap;
};
-}
+} // namespace
const SkMipmap* SkMipmapCache::FindAndRef(const SkBitmapCacheDesc& desc,
SkResourceCache* localCache) {
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 9630b7f..b55c4b5 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -213,7 +213,7 @@
sk_sp<SkSpecialImage> fImage;
SkIPoint fLoc;
};
-}
+} // namespace
/* This is the record we keep for each save/restore level in the stack.
Since a level optionally copies the matrix and/or stack, we have pointers
diff --git a/src/core/SkColorFilterBase.h b/src/core/SkColorFilterBase.h
index d76604f..2dfabb2 100644
--- a/src/core/SkColorFilterBase.h
+++ b/src/core/SkColorFilterBase.h
@@ -24,7 +24,7 @@
struct F32;
struct Uniforms;
struct Color;
-}
+} // namespace skvm
class SkColorFilterBase : public SkColorFilter {
public:
diff --git a/src/core/SkDrawShadowInfo.cpp b/src/core/SkDrawShadowInfo.cpp
index c8a4fe3..4a9653b 100644
--- a/src/core/SkDrawShadowInfo.cpp
+++ b/src/core/SkDrawShadowInfo.cpp
@@ -188,5 +188,5 @@
}
-}
+} // namespace SkDrawShadowMetrics
diff --git a/src/core/SkDrawShadowInfo.h b/src/core/SkDrawShadowInfo.h
index c1e7707..1d0415f 100644
--- a/src/core/SkDrawShadowInfo.h
+++ b/src/core/SkDrawShadowInfo.h
@@ -72,6 +72,6 @@
// get bounds prior to the ctm being applied
void GetLocalBounds(const SkPath&, const SkDrawShadowRec&, const SkMatrix& ctm, SkRect* bounds);
-}
+} // namespace SkDrawShadowMetrics
#endif
diff --git a/src/core/SkGeometry.h b/src/core/SkGeometry.h
index afb9692..9a60b9c 100644
--- a/src/core/SkGeometry.h
+++ b/src/core/SkGeometry.h
@@ -401,7 +401,7 @@
Sk2s fD;
};
-}
+} // namespace
#include "include/private/SkTemplates.h"
diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp
index 50ffe23..d5d36ab 100644
--- a/src/core/SkGpuBlurUtils.cpp
+++ b/src/core/SkGpuBlurUtils.cpp
@@ -551,6 +551,6 @@
return reexpand(context, std::move(rtc), scaledDstBounds, dstBounds.size(),
std::move(colorSpace), fit);
}
-}
+} // namespace SkGpuBlurUtils
#endif
diff --git a/src/core/SkGpuBlurUtils.h b/src/core/SkGpuBlurUtils.h
index 63d8fed..f90845d 100644
--- a/src/core/SkGpuBlurUtils.h
+++ b/src/core/SkGpuBlurUtils.h
@@ -49,7 +49,7 @@
float sigmaY,
SkTileMode mode,
SkBackingFit fit = SkBackingFit::kApprox);
-};
+} // namespace SkGpuBlurUtils
#endif
#endif
diff --git a/src/core/SkLegacyGpuBlurUtils.cpp b/src/core/SkLegacyGpuBlurUtils.cpp
index ec1655e..e5b3ae4 100644
--- a/src/core/SkLegacyGpuBlurUtils.cpp
+++ b/src/core/SkLegacyGpuBlurUtils.cpp
@@ -480,6 +480,6 @@
dstBounds.size(), std::move(colorSpace), fit);
}
-}
+} // namespace SkGpuBlurUtils
#endif
diff --git a/src/core/SkOpts.h b/src/core/SkOpts.h
index 04aee49..75eeffe 100644
--- a/src/core/SkOpts.h
+++ b/src/core/SkOpts.h
@@ -80,6 +80,6 @@
extern void (*interpret_skvm)(const skvm::InterpreterInstruction insts[], int ninsts,
int nregs, int loop, const int strides[], int nargs,
int n, void* args[]);
-}
+} // namespace SkOpts
#endif//SkOpts_DEFINED
diff --git a/src/core/SkRasterPipeline.h b/src/core/SkRasterPipeline.h
index 1fc2fad..ca55c34 100644
--- a/src/core/SkRasterPipeline.h
+++ b/src/core/SkRasterPipeline.h
@@ -164,7 +164,7 @@
namespace SkSL {
class ByteCode;
class ByteCodeFunction;
-}
+} // namespace SkSL
struct SkRasterPipeline_GradientCtx {
size_t stopCount;
diff --git a/src/core/SkRecords.cpp b/src/core/SkRecords.cpp
index 1b27660..29eb939 100644
--- a/src/core/SkRecords.cpp
+++ b/src/core/SkRecords.cpp
@@ -21,4 +21,4 @@
TypedMatrix::TypedMatrix(const SkMatrix& matrix) : SkMatrix(matrix) {
(void)this->getType();
}
-}
+} // namespace SkRecords
diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index bf18ae2..4b0bb8a 100644
--- a/src/core/SkResourceCache.cpp
+++ b/src/core/SkResourceCache.cpp
@@ -70,7 +70,7 @@
return rec->getKey();
}
};
-}
+} // namespace
class SkResourceCache::Hash :
public SkTHashTable<SkResourceCache::Rec*, SkResourceCache::Key, HashTraits> {};
diff --git a/src/core/SkRuntimeEffect.cpp b/src/core/SkRuntimeEffect.cpp
index f30efab..4227cbb 100644
--- a/src/core/SkRuntimeEffect.cpp
+++ b/src/core/SkRuntimeEffect.cpp
@@ -58,7 +58,7 @@
static SkSL::Compiler* gCompiler;
};
SkSL::Compiler* SharedCompiler::gCompiler = nullptr;
-}
+} // namespace SkSL
// Accepts a valid marker, or "normals(<marker>)"
static bool parse_marker(const SkSL::StringFragment& marker, uint32_t* id, uint32_t* flags) {
diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp
index b1bb98f..6d31107 100644
--- a/src/core/SkTextBlob.cpp
+++ b/src/core/SkTextBlob.cpp
@@ -34,7 +34,7 @@
uint32_t fFlags;
};
static_assert(sizeof(SkFont) == sizeof(RunFontStorageEquivalent), "runfont_should_stay_packed");
-}
+} // namespace
size_t SkTextBlob::RunRecord::StorageSize(uint32_t glyphCount, uint32_t textSize,
SkTextBlob::GlyphPositioning positioning,
@@ -76,7 +76,7 @@
uint32_t fFlags;
SkDEBUGCODE(unsigned fMagic;)
};
-}
+} // namespace
void SkTextBlob::RunRecord::validate(const uint8_t* storageTop) const {
SkASSERT(kRunRecordMagic == fMagic);
diff --git a/src/core/SkTextBlobTrace.h b/src/core/SkTextBlobTrace.h
index ab584c1..e982f25 100644
--- a/src/core/SkTextBlobTrace.h
+++ b/src/core/SkTextBlobTrace.h
@@ -45,5 +45,5 @@
Capture& operator=(const Capture&) = delete;
};
-} // namespace
+} // namespace SkTextBlobTrace
#endif // SkTextBlobTrace_DEFINED
diff --git a/src/core/SkUtils.h b/src/core/SkUtils.h
index 6fcff9f..4dc25d9 100644
--- a/src/core/SkUtils.h
+++ b/src/core/SkUtils.h
@@ -68,7 +68,7 @@
namespace SkHexadecimalDigits {
extern const char gUpper[16]; // 0-9A-F
extern const char gLower[16]; // 0-9a-f
-}
+} // namespace SkHexadecimalDigits
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkVM.cpp b/src/core/SkVM.cpp
index 3f9991d..d0d0f2c 100644
--- a/src/core/SkVM.cpp
+++ b/src/core/SkVM.cpp
@@ -212,7 +212,7 @@
write(o, " ");
write(o, rest...);
}
- }
+ } // namespace
void Builder::dot(SkWStream* o) const {
SkDebugfStream debug;
diff --git a/src/core/SkVM.h b/src/core/SkVM.h
index 2ef3d97..4d4cab0 100644
--- a/src/core/SkVM.h
+++ b/src/core/SkVM.h
@@ -1099,6 +1099,6 @@
return poly(x, x*a+b, rest...);
}
}
-}
+} // namespace skvm
#endif//SkVM_DEFINED
diff --git a/src/core/SkVM_fwd.h b/src/core/SkVM_fwd.h
index e8dc43f..ed1b5c6 100644
--- a/src/core/SkVM_fwd.h
+++ b/src/core/SkVM_fwd.h
@@ -18,6 +18,6 @@
struct Color;
struct Coord;
struct Uniforms;
-}
+} // namespace skvm
#endif//SkVM_fwd_DEFINED
diff --git a/src/core/SkYUVMath.cpp b/src/core/SkYUVMath.cpp
index 756bca7..2debe75 100644
--- a/src/core/SkYUVMath.cpp
+++ b/src/core/SkYUVMath.cpp
@@ -253,7 +253,7 @@
{ 0.2627f, 0.0593f, 12, kFull }, // kBT2020_12bit_Full_SkYUVColorSpace
{ 0.2627f, 0.0593f, 12, kLimited }, // kBT2020_12bit_Limited_SkYUVColorSpace
};
-}
+} // namespace
static void make_rgb_to_yuv_matrix(float mx[20], const YUVCoeff& c) {
SkASSERT(c.bits >= 8);
diff --git a/src/gpu/GrBlurUtils.h b/src/gpu/GrBlurUtils.h
index 57d96ec..4852ef3 100644
--- a/src/gpu/GrBlurUtils.h
+++ b/src/gpu/GrBlurUtils.h
@@ -51,6 +51,6 @@
GrPaint&&,
const SkMatrix& viewMatrix,
const SkMaskFilter*);
-};
+} // namespace GrBlurUtils
#endif
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 862577d..5173de1 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -409,7 +409,7 @@
ElementList fElements;
};
-}
+} // namespace
static void draw_clip_elements_to_mask_helper(GrSWMaskHelper& helper, const ElementList& elements,
const SkIRect& scissor, InitialState initialState) {
diff --git a/src/gpu/GrDefaultGeoProcFactory.h b/src/gpu/GrDefaultGeoProcFactory.h
index 423ce03..3b218aa 100644
--- a/src/gpu/GrDefaultGeoProcFactory.h
+++ b/src/gpu/GrDefaultGeoProcFactory.h
@@ -82,6 +82,6 @@
const Coverage&,
const LocalCoords&,
const SkMatrix& viewMatrix);
-};
+} // namespace GrDefaultGeoProcFactory
#endif
diff --git a/src/gpu/GrGpuResourceCacheAccess.h b/src/gpu/GrGpuResourceCacheAccess.h
index a346b7d..0e52884 100644
--- a/src/gpu/GrGpuResourceCacheAccess.h
+++ b/src/gpu/GrGpuResourceCacheAccess.h
@@ -13,7 +13,7 @@
namespace skiatest {
class Reporter;
-}
+} // namespace skiatest
/**
* This class allows GrResourceCache increased privileged access to GrGpuResource objects.
diff --git a/src/gpu/GrPersistentCacheUtils.h b/src/gpu/GrPersistentCacheUtils.h
index d6a15e7..37bf52f 100644
--- a/src/gpu/GrPersistentCacheUtils.h
+++ b/src/gpu/GrPersistentCacheUtils.h
@@ -122,6 +122,6 @@
return reader->isValid();
}
-}
+} // namespace GrPersistentCacheUtils
#endif
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index 23858cc..870dc35 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -38,7 +38,7 @@
return gPool;
}
};
-}
+} // namespace
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/GrProcessorUnitTest.h b/src/gpu/GrProcessorUnitTest.h
index 044f20f..5225c1f 100644
--- a/src/gpu/GrProcessorUnitTest.h
+++ b/src/gpu/GrProcessorUnitTest.h
@@ -40,7 +40,7 @@
creating an unbounded FP tree which may overflow various shader limits. */
std::unique_ptr<GrFragmentProcessor> MakeChildFP(GrProcessorTestData*);
-}
+} // namespace GrProcessorUnitTest
/*
* GrProcessorTestData is an argument struct to TestCreate functions
diff --git a/src/gpu/GrSPIRVUniformHandler.cpp b/src/gpu/GrSPIRVUniformHandler.cpp
index 4221539..79c6a24 100644
--- a/src/gpu/GrSPIRVUniformHandler.cpp
+++ b/src/gpu/GrSPIRVUniformHandler.cpp
@@ -198,7 +198,7 @@
return uniformOffset;
}
-}
+} // namespace
GrGLSLUniformHandler::UniformHandle GrSPIRVUniformHandler::internalAddUniformArray(
const GrFragmentProcessor* owner,
diff --git a/src/gpu/GrShaderCaps.h b/src/gpu/GrShaderCaps.h
index 3b3e1bf..e4ed906 100644
--- a/src/gpu/GrShaderCaps.h
+++ b/src/gpu/GrShaderCaps.h
@@ -15,7 +15,7 @@
namespace SkSL {
class ShaderCapsFactory;
-}
+} // namespace SkSL
struct GrContextOptions;
class SkJSONWriter;
diff --git a/src/gpu/GrShaderUtils.cpp b/src/gpu/GrShaderUtils.cpp
index 596c25e..56661a8 100644
--- a/src/gpu/GrShaderUtils.cpp
+++ b/src/gpu/GrShaderUtils.cpp
@@ -214,4 +214,4 @@
return &gHandler;
}
-} // namespace
+} // namespace GrShaderUtils
diff --git a/src/gpu/GrShaderUtils.h b/src/gpu/GrShaderUtils.h
index 5aaf466..b9995ce 100644
--- a/src/gpu/GrShaderUtils.h
+++ b/src/gpu/GrShaderUtils.h
@@ -28,6 +28,6 @@
GrContextOptions::ShaderErrorHandler* DefaultShaderErrorHandler();
-}
+} // namespace GrShaderUtils
#endif
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index af0ed0a..59e10a8 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -218,7 +218,7 @@
GrAA fAA;
};
-}
+} // namespace
////////////////////////////////////////////////////////////////////////////////
// return true on success; false on failure
diff --git a/src/gpu/GrStencilMaskHelper.cpp b/src/gpu/GrStencilMaskHelper.cpp
index a05dd1d..b4c237e 100644
--- a/src/gpu/GrStencilMaskHelper.cpp
+++ b/src/gpu/GrStencilMaskHelper.cpp
@@ -333,7 +333,7 @@
}
}
-} // anonymous
+} // namespace
bool GrStencilMaskHelper::init(const SkIRect& bounds, uint32_t genID,
const GrWindowRectangles& windowRects, int numFPs) {
diff --git a/src/gpu/GrTriangulator.cpp b/src/gpu/GrTriangulator.cpp
index f695d6e..e821c94 100644
--- a/src/gpu/GrTriangulator.cpp
+++ b/src/gpu/GrTriangulator.cpp
@@ -2540,4 +2540,4 @@
return actualCount;
}
-} // namespace
+} // namespace GrTriangulator
diff --git a/src/gpu/GrTriangulator.h b/src/gpu/GrTriangulator.h
index 1c9c143..499017f 100644
--- a/src/gpu/GrTriangulator.h
+++ b/src/gpu/GrTriangulator.h
@@ -57,6 +57,6 @@
int PathToTriangles(const SkPath& path, SkScalar tolerance, const SkRect& clipBounds,
GrEagerVertexAllocator*, Mode, int* numCountedCurves);
-}
+} // namespace GrTriangulator
#endif
diff --git a/src/gpu/ccpr/GrCCPathCache.cpp b/src/gpu/ccpr/GrCCPathCache.cpp
index cb86b55..9a537a7 100644
--- a/src/gpu/ccpr/GrCCPathCache.cpp
+++ b/src/gpu/ccpr/GrCCPathCache.cpp
@@ -158,7 +158,7 @@
int fShapeUnstyledKeyCount;
};
-}
+} // namespace
GrCCPathCache::OnFlushEntryRef GrCCPathCache::find(
GrOnFlushResourceProvider* onFlushRP, const GrStyledShape& shape,
diff --git a/src/gpu/ccpr/GrCCPerFlushResources.cpp b/src/gpu/ccpr/GrCCPerFlushResources.cpp
index cefd2db..2ca2a20 100644
--- a/src/gpu/ccpr/GrCCPerFlushResources.cpp
+++ b/src/gpu/ccpr/GrCCPerFlushResources.cpp
@@ -161,7 +161,7 @@
const SkIRect fDrawBounds;
};
-}
+} // namespace
static int inst_buffer_count(const GrCCPerFlushResourceSpecs& specs) {
return specs.fNumCachedPaths +
diff --git a/src/gpu/ccpr/GrStencilAtlasOp.cpp b/src/gpu/ccpr/GrStencilAtlasOp.cpp
index 322a626..ba35493 100644
--- a/src/gpu/ccpr/GrStencilAtlasOp.cpp
+++ b/src/gpu/ccpr/GrStencilAtlasOp.cpp
@@ -65,7 +65,7 @@
return new Impl();
}
-}
+} // namespace
std::unique_ptr<GrDrawOp> GrStencilAtlasOp::Make(
GrRecordingContext* context, sk_sp<const GrCCPerFlushResources> resources,
diff --git a/src/gpu/effects/GrBlendFragmentProcessor.h b/src/gpu/effects/GrBlendFragmentProcessor.h
index 8de432c..2f0dcee 100644
--- a/src/gpu/effects/GrBlendFragmentProcessor.h
+++ b/src/gpu/effects/GrBlendFragmentProcessor.h
@@ -40,6 +40,6 @@
SkBlendMode mode,
BlendBehavior behavior = BlendBehavior::kDefault);
-};
+} // namespace GrBlendFragmentProcessor
#endif
diff --git a/src/gpu/effects/GrCustomXfermode.h b/src/gpu/effects/GrCustomXfermode.h
index 672a512..a4855aa 100644
--- a/src/gpu/effects/GrCustomXfermode.h
+++ b/src/gpu/effects/GrCustomXfermode.h
@@ -21,6 +21,6 @@
namespace GrCustomXfermode {
bool IsSupportedMode(SkBlendMode mode);
const GrXPFactory* Get(SkBlendMode mode);
-};
+} // namespace GrCustomXfermode
#endif
diff --git a/src/gpu/effects/GrOvalEffect.h b/src/gpu/effects/GrOvalEffect.h
index 955c194..18fec97 100644
--- a/src/gpu/effects/GrOvalEffect.h
+++ b/src/gpu/effects/GrOvalEffect.h
@@ -23,6 +23,6 @@
*/
GrFPResult Make(std::unique_ptr<GrFragmentProcessor>, GrClipEdgeType, const SkRect&,
const GrShaderCaps&);
-};
+} // namespace GrOvalEffect
#endif
diff --git a/src/gpu/effects/GrRRectEffect.h b/src/gpu/effects/GrRRectEffect.h
index e61246f..7a65c54 100644
--- a/src/gpu/effects/GrRRectEffect.h
+++ b/src/gpu/effects/GrRRectEffect.h
@@ -26,6 +26,6 @@
GrFPResult Make(std::unique_ptr<GrFragmentProcessor>, GrClipEdgeType, const SkRRect&,
const GrShaderCaps&);
-};
+} // namespace GrRRectEffect
#endif
diff --git a/src/gpu/geometry/GrPathUtils.cpp b/src/gpu/geometry/GrPathUtils.cpp
index 55d1207..9ee165a 100644
--- a/src/gpu/geometry/GrPathUtils.cpp
+++ b/src/gpu/geometry/GrPathUtils.cpp
@@ -589,7 +589,7 @@
convert_noninflect_cubic_to_quads_with_constraint(
choppedPts + 3, toleranceSqd, dir, quads, sublevel + 1);
}
-}
+} // namespace
void GrPathUtils::convertCubicToQuads(const SkPoint p[4],
SkScalar tolScale,
diff --git a/src/gpu/geometry/GrPathUtils.h b/src/gpu/geometry/GrPathUtils.h
index f44f2c0..35e6738 100644
--- a/src/gpu/geometry/GrPathUtils.h
+++ b/src/gpu/geometry/GrPathUtils.h
@@ -213,5 +213,5 @@
// We guarantee that no quad or cubic will ever produce more than this many points
static const int kMaxPointsPerCurve = 1 << 10;
-};
+} // namespace GrPathUtils
#endif
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index eb8bacd..6f1e172 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -1089,7 +1089,7 @@
namespace {
const GrGLuint kUnknownBitCount = GrGLStencilAttachment::kUnknownBitCount;
-}
+} // namespace
void GrGLCaps::initStencilSupport(const GrGLContextInfo& ctxInfo) {
diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/gl/GrGLContext.h
index 66bfe29..2816bb8 100644
--- a/src/gpu/gl/GrGLContext.h
+++ b/src/gpu/gl/GrGLContext.h
@@ -18,7 +18,7 @@
struct GrContextOptions;
namespace SkSL {
class Compiler;
-}
+} // namespace SkSL
/**
* Encapsulates information about an OpenGL context including the OpenGL
diff --git a/src/gpu/gl/GrGLExtensions.cpp b/src/gpu/gl/GrGLExtensions.cpp
index 1429ab5..c537911 100644
--- a/src/gpu/gl/GrGLExtensions.cpp
+++ b/src/gpu/gl/GrGLExtensions.cpp
@@ -17,7 +17,7 @@
inline bool extension_compare(const SkString& a, const SkString& b) {
return strcmp(a.c_str(), b.c_str()) < 0;
}
-}
+} // namespace
// finds the index of ext in strings or a negative result if ext is not found.
static int find_string(const SkTArray<SkString>& strings, const char ext[]) {
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 768aeef..858b6ae 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -1550,7 +1550,7 @@
}
}
}
-}
+} // namespace
int GrGLGpu::getCompatibleStencilIndex(GrGLFormat format) {
static const int kSize = 16;
@@ -2399,7 +2399,7 @@
GR_GL_CALL(gl, StencilOpSeparate(glFace, glFailOp, GR_GL_KEEP, glPassOp));
}
}
-}
+} // namespace
void GrGLGpu::flushStencil(const GrStencilSettings& stencilSettings, GrSurfaceOrigin origin) {
if (stencilSettings.isDisabled()) {
diff --git a/src/gpu/glsl/GrGLSLBlend.h b/src/gpu/glsl/GrGLSLBlend.h
index 2b8ecb1..e5b0647 100644
--- a/src/gpu/glsl/GrGLSLBlend.h
+++ b/src/gpu/glsl/GrGLSLBlend.h
@@ -30,6 +30,6 @@
const char* dstColor,
const char* outColor,
SkBlendMode mode);
-};
+} // namespace GrGLSLBlend
#endif
diff --git a/src/gpu/gradients/GrGradientShader.cpp b/src/gpu/gradients/GrGradientShader.cpp
index 08b4c43..7f3695e 100644
--- a/src/gpu/gradients/GrGradientShader.cpp
+++ b/src/gpu/gradients/GrGradientShader.cpp
@@ -308,4 +308,4 @@
}
#endif
-}
+} // namespace GrGradientShader
diff --git a/src/gpu/gradients/GrGradientShader.h b/src/gpu/gradients/GrGradientShader.h
index c8710e7..e08f46c 100644
--- a/src/gpu/gradients/GrGradientShader.h
+++ b/src/gpu/gradients/GrGradientShader.h
@@ -60,6 +60,6 @@
};
#endif
-}
+} // namespace GrGradientShader
#endif // GrGradientShader_DEFINE
diff --git a/src/gpu/ops/GrDashOp.h b/src/gpu/ops/GrDashOp.h
index db16a71..22fc48b 100644
--- a/src/gpu/ops/GrDashOp.h
+++ b/src/gpu/ops/GrDashOp.h
@@ -33,6 +33,6 @@
const GrStyle& style,
const GrUserStencilSettings*);
bool CanDrawDashLine(const SkPoint pts[2], const GrStyle& style, const SkMatrix& viewMatrix);
-}
+} // namespace GrDashOp
#endif
diff --git a/src/gpu/ops/GrDrawAtlasOp.h b/src/gpu/ops/GrDrawAtlasOp.h
index 425dba4..f607f4e 100644
--- a/src/gpu/ops/GrDrawAtlasOp.h
+++ b/src/gpu/ops/GrDrawAtlasOp.h
@@ -25,6 +25,6 @@
const SkRSXform* xforms,
const SkRect* rects,
const SkColor* colors);
-};
+} // namespace GrDrawAtlasOp
#endif
diff --git a/src/gpu/ops/GrDrawVerticesOp.h b/src/gpu/ops/GrDrawVerticesOp.h
index 4cee5fd..6dedacd 100644
--- a/src/gpu/ops/GrDrawVerticesOp.h
+++ b/src/gpu/ops/GrDrawVerticesOp.h
@@ -36,6 +36,6 @@
GrPrimitiveType* overridePrimType,
const SkRuntimeEffect*);
-};
+} // namespace GrDrawVerticesOp
#endif
diff --git a/src/gpu/ops/GrFillRRectOp.h b/src/gpu/ops/GrFillRRectOp.h
index c718006..3d0949a 100644
--- a/src/gpu/ops/GrFillRRectOp.h
+++ b/src/gpu/ops/GrFillRRectOp.h
@@ -23,6 +23,6 @@
const SkMatrix& viewMatrix,
const SkRRect&,
GrAAType);
-};
+} // namespace GrFillRRectOp
#endif
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index aeb1095..e09de27 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -377,7 +377,7 @@
return NonAALatticeOp::Make(context, std::move(paint), viewMatrix, std::move(view), alphaType,
std::move(colorSpaceXform), filter, std::move(iter), dst);
}
-};
+} // namespace GrLatticeOp
#if GR_TEST_UTILS
#include "src/gpu/GrProxyProvider.h"
diff --git a/src/gpu/ops/GrLatticeOp.h b/src/gpu/ops/GrLatticeOp.h
index d8c3de4..f77021f 100644
--- a/src/gpu/ops/GrLatticeOp.h
+++ b/src/gpu/ops/GrLatticeOp.h
@@ -31,6 +31,6 @@
GrSamplerState::Filter,
std::unique_ptr<SkLatticeIter>,
const SkRect& dst);
-};
+} // namespace GrLatticeOp
#endif
diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ops/GrOvalOpFactory.cpp
index bf8eca0..b40fcb0 100644
--- a/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/src/gpu/ops/GrOvalOpFactory.cpp
@@ -39,7 +39,7 @@
return GrVertexWriter::TriStrip<float>{ -x, -y, x, y };
};
-}
+} // namespace
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/ops/GrRegionOp.cpp b/src/gpu/ops/GrRegionOp.cpp
index a37e946..f9c1885 100644
--- a/src/gpu/ops/GrRegionOp.cpp
+++ b/src/gpu/ops/GrRegionOp.cpp
@@ -212,7 +212,7 @@
}
return RegionOp::Make(context, std::move(paint), viewMatrix, region, aaType, stencilSettings);
}
-}
+} // namespace GrRegionOp
#if GR_TEST_UTILS
diff --git a/src/gpu/ops/GrRegionOp.h b/src/gpu/ops/GrRegionOp.h
index d7dc17c..2502d3e 100644
--- a/src/gpu/ops/GrRegionOp.h
+++ b/src/gpu/ops/GrRegionOp.h
@@ -25,6 +25,6 @@
const SkRegion&,
GrAAType,
const GrUserStencilSettings* stencilSettings = nullptr);
-}
+} // namespace GrRegionOp
#endif
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index cbdbe11..144e81b 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -738,7 +738,7 @@
scaledInsetWidth,
std::move(falloffView));
}
-}
+} // namespace GrShadowRRectOp
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/ops/GrShadowRRectOp.h b/src/gpu/ops/GrShadowRRectOp.h
index c4d313d..964c158 100644
--- a/src/gpu/ops/GrShadowRRectOp.h
+++ b/src/gpu/ops/GrShadowRRectOp.h
@@ -25,6 +25,6 @@
const SkRRect&,
SkScalar blurWidth,
SkScalar insetWidth);
-}
+} // namespace GrShadowRRectOp
#endif
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index ab7d7a3..10c1686 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -62,7 +62,7 @@
atlas->setLastUseToken(shapeData->fAtlasLocator, token);
}
-} // GrSmallPathAtlasMgr
+} // namespace GrSmallPathAtlasMgr
// Callback to clear out internal path cache when eviction occurs
void GrSmallPathRenderer::evict(GrDrawOpAtlas::PlotLocator plotLocator) {
diff --git a/src/gpu/tessellate/GrWangsFormula.h b/src/gpu/tessellate/GrWangsFormula.h
index b9c3264..9392a24 100644
--- a/src/gpu/tessellate/GrWangsFormula.h
+++ b/src/gpu/tessellate/GrWangsFormula.h
@@ -126,6 +126,6 @@
return ceil_log2_sqrt_sqrt(4*k*k * (devWidth * devWidth + devHeight * devHeight));
}
-} // namespace
+} // namespace GrWangsFormula
#endif
diff --git a/src/gpu/vk/GrVkExtensions.cpp b/src/gpu/vk/GrVkExtensions.cpp
index 57aeb22..16ffd2f 100644
--- a/src/gpu/vk/GrVkExtensions.cpp
+++ b/src/gpu/vk/GrVkExtensions.cpp
@@ -30,7 +30,7 @@
inline bool extension_compare(const GrVkExtensions::Info& a, const GrVkExtensions::Info& b) {
return strcmp(a.fName.c_str(), b.fName.c_str()) < 0;
}
-}
+} // namespace
void GrVkExtensions::init(GrVkGetProc getProc,
VkInstance instance,
diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h
index eca9279..a21504c 100644
--- a/src/gpu/vk/GrVkGpu.h
+++ b/src/gpu/vk/GrVkGpu.h
@@ -36,7 +36,7 @@
namespace SkSL {
class Compiler;
-}
+} // namespace SkSL
class GrVkGpu : public GrGpu {
public:
diff --git a/src/gpu/vk/GrVkMemory.h b/src/gpu/vk/GrVkMemory.h
index 2cb91fd..c0aadb1 100644
--- a/src/gpu/vk/GrVkMemory.h
+++ b/src/gpu/vk/GrVkMemory.h
@@ -51,6 +51,6 @@
// memory.
void GetNonCoherentMappedMemoryRange(const GrVkAlloc&, VkDeviceSize offset, VkDeviceSize size,
VkDeviceSize alignment, VkMappedMemoryRange*);
-}
+} // namespace GrVkMemory
#endif
diff --git a/src/opts/SkBlitMask_opts.h b/src/opts/SkBlitMask_opts.h
index 2dfe5ec..93ae81c 100644
--- a/src/opts/SkBlitMask_opts.h
+++ b/src/opts/SkBlitMask_opts.h
@@ -226,6 +226,6 @@
}
}
-} // SK_OPTS_NS
+} // namespace SK_OPTS_NS
#endif//SkBlitMask_opts_DEFINED
diff --git a/src/opts/SkBlitRow_opts.h b/src/opts/SkBlitRow_opts.h
index 3dbd43d..1e64498 100644
--- a/src/opts/SkBlitRow_opts.h
+++ b/src/opts/SkBlitRow_opts.h
@@ -453,6 +453,6 @@
}
}
-} // SK_OPTS_NS
+} // namespace SK_OPTS_NS
#endif//SkBlitRow_opts_DEFINED
diff --git a/src/opts/SkOpts_avx.cpp b/src/opts/SkOpts_avx.cpp
index 99d828f..07dab88 100644
--- a/src/opts/SkOpts_avx.cpp
+++ b/src/opts/SkOpts_avx.cpp
@@ -20,4 +20,4 @@
rect_memset32 = SK_OPTS_NS::rect_memset32;
rect_memset64 = SK_OPTS_NS::rect_memset64;
}
-}
+} // namespace SkOpts
diff --git a/src/opts/SkOpts_hsw.cpp b/src/opts/SkOpts_hsw.cpp
index 94c4ed2..d5290b2 100644
--- a/src/opts/SkOpts_hsw.cpp
+++ b/src/opts/SkOpts_hsw.cpp
@@ -48,4 +48,4 @@
interpret_skvm = SK_OPTS_NS::interpret_skvm;
}
-}
+} // namespace SkOpts
diff --git a/src/opts/SkOpts_skx.cpp b/src/opts/SkOpts_skx.cpp
index a13743c..2543455 100644
--- a/src/opts/SkOpts_skx.cpp
+++ b/src/opts/SkOpts_skx.cpp
@@ -24,4 +24,4 @@
inverted_CMYK_to_RGB1 = SK_OPTS_NS::inverted_CMYK_to_RGB1;
inverted_CMYK_to_BGR1 = SK_OPTS_NS::inverted_CMYK_to_BGR1;
}
-}
+} // namespace SkOpts
diff --git a/src/opts/SkOpts_sse42.cpp b/src/opts/SkOpts_sse42.cpp
index 8e80fff..82e5d47 100644
--- a/src/opts/SkOpts_sse42.cpp
+++ b/src/opts/SkOpts_sse42.cpp
@@ -14,5 +14,5 @@
void Init_sse42() {
hash_fn = sse42::hash_fn;
}
-}
+} // namespace SkOpts
diff --git a/src/opts/SkOpts_ssse3.cpp b/src/opts/SkOpts_ssse3.cpp
index daa6987..c34f031 100644
--- a/src/opts/SkOpts_ssse3.cpp
+++ b/src/opts/SkOpts_ssse3.cpp
@@ -30,4 +30,4 @@
S32_alpha_D32_filter_DX = ssse3::S32_alpha_D32_filter_DX;
}
-}
+} // namespace SkOpts
diff --git a/src/opts/SkSwizzler_opts.h b/src/opts/SkSwizzler_opts.h
index 3ef8cc6..882bb1c 100644
--- a/src/opts/SkSwizzler_opts.h
+++ b/src/opts/SkSwizzler_opts.h
@@ -1384,6 +1384,6 @@
}
#endif
-}
+} // namespace SK_OPTS_NS
#endif // SkSwizzler_opts_DEFINED
diff --git a/src/opts/SkUtils_opts.h b/src/opts/SkUtils_opts.h
index 6605457..257d9bf 100644
--- a/src/opts/SkUtils_opts.h
+++ b/src/opts/SkUtils_opts.h
@@ -61,6 +61,6 @@
rect_memsetT(buffer, value, count, rowBytes, height);
}
-}
+} // namespace SK_OPTS_NS
#endif//SkUtils_opts_DEFINED
diff --git a/src/opts/SkVM_opts.h b/src/opts/SkVM_opts.h
index a385789..401c516 100644
--- a/src/opts/SkVM_opts.h
+++ b/src/opts/SkVM_opts.h
@@ -266,6 +266,6 @@
}
}
-}
+} // namespace SK_OPTS_NS
#endif//SkVM_opts_DEFINED
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index b31ec05..d6363c7 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -96,7 +96,7 @@
int fMarkId;
};
-}
+} // namespace
// Utility functions
@@ -735,7 +735,7 @@
SkPoint fPos;
SkGlyphID fGlyph;
};
-}
+} // namespace
static SkRect get_glyph_bounds_device_space(const SkGlyph* glyph,
SkScalar xScale, SkScalar yScale,
diff --git a/src/pdf/SkPDFDocumentPriv.h b/src/pdf/SkPDFDocumentPriv.h
index 6d9220d..3ec9809 100644
--- a/src/pdf/SkPDFDocumentPriv.h
+++ b/src/pdf/SkPDFDocumentPriv.h
@@ -31,7 +31,7 @@
namespace SkPDFGradientShader {
struct Key;
struct KeyHash;
-}
+} // namespace SkPDFGradientShader
const char* SkPDFGetNodeIdKey();
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 3d13bb8..e5ec7ee 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -435,7 +435,7 @@
const SkGlyphID fFirst;
const SkGlyphID fLast;
};
-}
+} // namespace
struct ImageAndOffset {
sk_sp<SkImage> fImage;
diff --git a/src/pdf/SkPDFGraphicState.h b/src/pdf/SkPDFGraphicState.h
index e5dd192..03c75b1 100644
--- a/src/pdf/SkPDFGraphicState.h
+++ b/src/pdf/SkPDFGraphicState.h
@@ -42,7 +42,7 @@
bool invert,
SkPDFSMaskMode sMaskMode,
SkPDFDocument* doc);
-}
+} // namespace SkPDFGraphicState
SK_BEGIN_REQUIRE_DENSE
struct SkPDFStrokeGraphicState {
diff --git a/src/pdf/SkPDFMetadata.h b/src/pdf/SkPDFMetadata.h
index 590caff..d9df0ae 100644
--- a/src/pdf/SkPDFMetadata.h
+++ b/src/pdf/SkPDFMetadata.h
@@ -25,5 +25,5 @@
const SkUUID& doc,
const SkUUID& instance,
SkPDFDocument*);
-}
+} // namespace SkPDFMetadata
#endif // SkPDFMetadata_DEFINED
diff --git a/src/ports/SkFontMgr_android_parser.cpp b/src/ports/SkFontMgr_android_parser.cpp
index c5c4092..620c5de 100644
--- a/src/ports/SkFontMgr_android_parser.cpp
+++ b/src/ports/SkFontMgr_android_parser.cpp
@@ -397,7 +397,7 @@
/*chars*/nullptr,
};
-} // lmpParser
+} // namespace lmpParser
namespace jbParser {
diff --git a/src/ports/SkFontMgr_android_parser.h b/src/ports/SkFontMgr_android_parser.h
index 7a33f30..415874a 100644
--- a/src/ports/SkFontMgr_android_parser.h
+++ b/src/ports/SkFontMgr_android_parser.h
@@ -115,7 +115,7 @@
const char* fallbackFontsXml,
const char* langFallbackFontsDir = nullptr);
-} // SkFontMgr_Android_Parser namespace
+} // namespace SkFontMgr_Android_Parser
/** Parses a null terminated string into an integer type, checking for overflow.
diff --git a/src/sfnt/SkOTTable_name.cpp b/src/sfnt/SkOTTable_name.cpp
index ecb3ce4..4d93674 100644
--- a/src/sfnt/SkOTTable_name.cpp
+++ b/src/sfnt/SkOTTable_name.cpp
@@ -453,7 +453,7 @@
bool BCP47FromLanguageIdLess(const BCP47FromLanguageId& a, const BCP47FromLanguageId& b) {
return a.languageID < b.languageID;
}
-}
+} // namespace
bool SkOTTableName::Iterator::next(SkOTTableName::Iterator::Record& record) {
SkOTTableName nameTable;
diff --git a/src/sksl/SkSLASTFile.h b/src/sksl/SkSLASTFile.h
index 71fb8eb..85c835e 100644
--- a/src/sksl/SkSLASTFile.h
+++ b/src/sksl/SkSLASTFile.h
@@ -29,6 +29,6 @@
friend class Parser;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLASTNode.cpp b/src/sksl/SkSLASTNode.cpp
index a74d5ab..8b7afdb 100644
--- a/src/sksl/SkSLASTNode.cpp
+++ b/src/sksl/SkSLASTNode.cpp
@@ -242,4 +242,4 @@
}
#endif
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLASTNode.h b/src/sksl/SkSLASTNode.h
index 72cfcda..a4852e1 100644
--- a/src/sksl/SkSLASTNode.h
+++ b/src/sksl/SkSLASTNode.h
@@ -632,6 +632,6 @@
ID fNext;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLAnalysis.cpp b/src/sksl/SkSLAnalysis.cpp
index 3b20ac9..3d2b2a6 100644
--- a/src/sksl/SkSLAnalysis.cpp
+++ b/src/sksl/SkSLAnalysis.cpp
@@ -147,7 +147,7 @@
typedef ProgramVisitor INHERITED;
};
-}
+} // namespace
////////////////////////////////////////////////////////////////////////////////
// Analysis
@@ -332,4 +332,4 @@
}
}
-}
+} // namespace SkSL
diff --git a/src/sksl/SkSLAnalysis.h b/src/sksl/SkSLAnalysis.h
index 99d9ea7..bdb9ac5 100644
--- a/src/sksl/SkSLAnalysis.h
+++ b/src/sksl/SkSLAnalysis.h
@@ -66,6 +66,6 @@
const Program* fProgram;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLByteCode.h b/src/sksl/SkSLByteCode.h
index 5fee07f..845a6a8 100644
--- a/src/sksl/SkSLByteCode.h
+++ b/src/sksl/SkSLByteCode.h
@@ -291,6 +291,6 @@
std::vector<ExternalValue*> fExternalValues;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLByteCodeGenerator.cpp b/src/sksl/SkSLByteCodeGenerator.cpp
index 1e267da..9f6148c 100644
--- a/src/sksl/SkSLByteCodeGenerator.cpp
+++ b/src/sksl/SkSLByteCodeGenerator.cpp
@@ -1822,4 +1822,4 @@
}
}
-}
+} // namespace SkSL
diff --git a/src/sksl/SkSLByteCodeGenerator.h b/src/sksl/SkSLByteCodeGenerator.h
index 9178c4f..3139d9c 100644
--- a/src/sksl/SkSLByteCodeGenerator.h
+++ b/src/sksl/SkSLByteCodeGenerator.h
@@ -356,6 +356,6 @@
typedef CodeGenerator INHERITED;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLCFGGenerator.cpp b/src/sksl/SkSLCFGGenerator.cpp
index dcd3fba..9c52ffc 100644
--- a/src/sksl/SkSLCFGGenerator.cpp
+++ b/src/sksl/SkSLCFGGenerator.cpp
@@ -680,4 +680,4 @@
return result;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLCFGGenerator.h b/src/sksl/SkSLCFGGenerator.h
index 895f3e0..1aeddff 100644
--- a/src/sksl/SkSLCFGGenerator.h
+++ b/src/sksl/SkSLCFGGenerator.h
@@ -167,6 +167,6 @@
std::stack<BlockId> fLoopExits;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLCPPCodeGenerator.cpp b/src/sksl/SkSLCPPCodeGenerator.cpp
index 25ed56e..e97cfd7 100644
--- a/src/sksl/SkSLCPPCodeGenerator.cpp
+++ b/src/sksl/SkSLCPPCodeGenerator.cpp
@@ -1302,4 +1302,4 @@
return result;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLCPPCodeGenerator.h b/src/sksl/SkSLCPPCodeGenerator.h
index 8543ab1..d7ee69c 100644
--- a/src/sksl/SkSLCPPCodeGenerator.h
+++ b/src/sksl/SkSLCPPCodeGenerator.h
@@ -139,6 +139,6 @@
typedef GLSLCodeGenerator INHERITED;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLCPPUniformCTypes.cpp b/src/sksl/SkSLCPPUniformCTypes.cpp
index f18c410..74146d7 100644
--- a/src/sksl/SkSLCPPUniformCTypes.cpp
+++ b/src/sksl/SkSLCPPUniformCTypes.cpp
@@ -231,4 +231,4 @@
return nullptr;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLCPPUniformCTypes.h b/src/sksl/SkSLCPPUniformCTypes.h
index c2c01f9..a838aa5 100644
--- a/src/sksl/SkSLCPPUniformCTypes.h
+++ b/src/sksl/SkSLCPPUniformCTypes.h
@@ -128,6 +128,6 @@
String fSaveStateTemplate;
};
-} // namespace
+} // namespace SkSL
#endif // SkSLUniformCTypes_DEFINED
diff --git a/src/sksl/SkSLCodeGenerator.h b/src/sksl/SkSLCodeGenerator.h
index 8541c29..007a364 100644
--- a/src/sksl/SkSLCodeGenerator.h
+++ b/src/sksl/SkSLCodeGenerator.h
@@ -37,6 +37,6 @@
OutputStream* fOut;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index cfb13d7..ba1221c 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -1944,4 +1944,4 @@
}
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLCompiler.h b/src/sksl/SkSLCompiler.h
index 47f3316..52e800c 100644
--- a/src/sksl/SkSLCompiler.h
+++ b/src/sksl/SkSLCompiler.h
@@ -261,6 +261,6 @@
};
#endif
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLContext.h b/src/sksl/SkSLContext.h
index f14f156..705fb8f 100644
--- a/src/sksl/SkSLContext.h
+++ b/src/sksl/SkSLContext.h
@@ -405,6 +405,6 @@
}
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLErrorReporter.h b/src/sksl/SkSLErrorReporter.h
index a487e80..9a29b0b 100644
--- a/src/sksl/SkSLErrorReporter.h
+++ b/src/sksl/SkSLErrorReporter.h
@@ -28,6 +28,6 @@
virtual int errorCount() = 0;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLExternalValue.h b/src/sksl/SkSLExternalValue.h
index d8aba5d..d56b815 100644
--- a/src/sksl/SkSLExternalValue.h
+++ b/src/sksl/SkSLExternalValue.h
@@ -111,6 +111,6 @@
const Type& fType;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index 36b9391..bb82717 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -1797,4 +1797,4 @@
return 0 == fErrors.errorCount();
}
-}
+} // namespace SkSL
diff --git a/src/sksl/SkSLGLSLCodeGenerator.h b/src/sksl/SkSLGLSLCodeGenerator.h
index 9977cf8..8c9130b 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.h
+++ b/src/sksl/SkSLGLSLCodeGenerator.h
@@ -261,6 +261,6 @@
typedef CodeGenerator INHERITED;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLHCodeGenerator.cpp b/src/sksl/SkSLHCodeGenerator.cpp
index e9ab69d..92da59f 100644
--- a/src/sksl/SkSLHCodeGenerator.cpp
+++ b/src/sksl/SkSLHCodeGenerator.cpp
@@ -379,4 +379,4 @@
return 0 == fErrors.errorCount();
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLIRGenerator.cpp b/src/sksl/SkSLIRGenerator.cpp
index ca48897..573f7f2 100644
--- a/src/sksl/SkSLIRGenerator.cpp
+++ b/src/sksl/SkSLIRGenerator.cpp
@@ -3209,4 +3209,4 @@
}
-}
+} // namespace SkSL
diff --git a/src/sksl/SkSLIRGenerator.h b/src/sksl/SkSLIRGenerator.h
index c0f4a12..63cb321 100644
--- a/src/sksl/SkSLIRGenerator.h
+++ b/src/sksl/SkSLIRGenerator.h
@@ -200,6 +200,6 @@
friend class Compiler;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLMemoryLayout.h b/src/sksl/SkSLMemoryLayout.h
index 87afe12..1b30504 100644
--- a/src/sksl/SkSLMemoryLayout.h
+++ b/src/sksl/SkSLMemoryLayout.h
@@ -139,6 +139,6 @@
const Standard fStd;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index 026c85e..b090962 100644
--- a/src/sksl/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -1823,4 +1823,4 @@
return true;
}
-}
+} // namespace SkSL
diff --git a/src/sksl/SkSLMetalCodeGenerator.h b/src/sksl/SkSLMetalCodeGenerator.h
index 2d82731..39822ff 100644
--- a/src/sksl/SkSLMetalCodeGenerator.h
+++ b/src/sksl/SkSLMetalCodeGenerator.h
@@ -286,6 +286,6 @@
typedef CodeGenerator INHERITED;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLOutputStream.cpp b/src/sksl/SkSLOutputStream.cpp
index de5f27d..54a9315 100644
--- a/src/sksl/SkSLOutputStream.cpp
+++ b/src/sksl/SkSLOutputStream.cpp
@@ -36,4 +36,4 @@
}
}
-}
+} // namespace SkSL
diff --git a/src/sksl/SkSLOutputStream.h b/src/sksl/SkSLOutputStream.h
index 4a71e10..2e692f7 100644
--- a/src/sksl/SkSLOutputStream.h
+++ b/src/sksl/SkSLOutputStream.h
@@ -49,6 +49,6 @@
static const int kBufferSize = 1024;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLParser.cpp b/src/sksl/SkSLParser.cpp
index e79a728..aaf826a 100644
--- a/src/sksl/SkSLParser.cpp
+++ b/src/sksl/SkSLParser.cpp
@@ -2179,4 +2179,4 @@
return false;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLParser.h b/src/sksl/SkSLParser.h
index 7984856..41bea40 100644
--- a/src/sksl/SkSLParser.h
+++ b/src/sksl/SkSLParser.h
@@ -286,6 +286,6 @@
friend class HCodeGenerator;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLPipelineStageCodeGenerator.cpp b/src/sksl/SkSLPipelineStageCodeGenerator.cpp
index acbeed0..6e9e4b4 100644
--- a/src/sksl/SkSLPipelineStageCodeGenerator.cpp
+++ b/src/sksl/SkSLPipelineStageCodeGenerator.cpp
@@ -242,5 +242,5 @@
INHERITED::writeProgramElement(p);
}
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLPipelineStageCodeGenerator.h b/src/sksl/SkSLPipelineStageCodeGenerator.h
index 9a6a390..304445a 100644
--- a/src/sksl/SkSLPipelineStageCodeGenerator.h
+++ b/src/sksl/SkSLPipelineStageCodeGenerator.h
@@ -46,7 +46,7 @@
typedef GLSLCodeGenerator INHERITED;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLPosition.h b/src/sksl/SkSLPosition.h
index 96a2f4b..fd24fb7 100644
--- a/src/sksl/SkSLPosition.h
+++ b/src/sksl/SkSLPosition.h
@@ -34,6 +34,6 @@
int fColumn;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLRehydrator.cpp b/src/sksl/SkSLRehydrator.cpp
index 57df393..220bf19 100644
--- a/src/sksl/SkSLRehydrator.cpp
+++ b/src/sksl/SkSLRehydrator.cpp
@@ -584,4 +584,4 @@
return result;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLRehydrator.h b/src/sksl/SkSLRehydrator.h
index 9afcbcb..1b4ee6f 100644
--- a/src/sksl/SkSLRehydrator.h
+++ b/src/sksl/SkSLRehydrator.h
@@ -234,6 +234,6 @@
friend class AutoRehydratorSymbolTable;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp
index 3646ae0..663a13e 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.cpp
+++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp
@@ -3289,4 +3289,4 @@
return 0 == fErrors.errorCount();
}
-}
+} // namespace SkSL
diff --git a/src/sksl/SkSLSPIRVCodeGenerator.h b/src/sksl/SkSLSPIRVCodeGenerator.h
index f62674f..46ade0d 100644
--- a/src/sksl/SkSLSPIRVCodeGenerator.h
+++ b/src/sksl/SkSLSPIRVCodeGenerator.h
@@ -77,7 +77,7 @@
}
};
-}
+} // namespace std
namespace SkSL {
@@ -406,6 +406,6 @@
typedef CodeGenerator INHERITED;
};
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLSPIRVtoHLSL.h b/src/sksl/SkSLSPIRVtoHLSL.h
index 2823813..242115d 100644
--- a/src/sksl/SkSLSPIRVtoHLSL.h
+++ b/src/sksl/SkSLSPIRVtoHLSL.h
@@ -14,6 +14,6 @@
bool SPIRVtoHLSL(const String& spirv, String* hlsl);
-}
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLSampleUsage.cpp b/src/sksl/SkSLSampleUsage.cpp
index 6eac4b6..c545ce3 100644
--- a/src/sksl/SkSLSampleUsage.cpp
+++ b/src/sksl/SkSLSampleUsage.cpp
@@ -101,4 +101,4 @@
return result;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLSectionAndParameterHelper.cpp b/src/sksl/SkSLSectionAndParameterHelper.cpp
index 069eb51..f746453 100644
--- a/src/sksl/SkSLSectionAndParameterHelper.cpp
+++ b/src/sksl/SkSLSectionAndParameterHelper.cpp
@@ -70,4 +70,4 @@
}
}
-}
+} // namespace SkSL
diff --git a/src/sksl/SkSLString.cpp b/src/sksl/SkSLString.cpp
index 0772210..4eac836 100644
--- a/src/sksl/SkSLString.cpp
+++ b/src/sksl/SkSLString.cpp
@@ -266,4 +266,4 @@
return result;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLStringStream.h b/src/sksl/SkSLStringStream.h
index d34d08d..2cd65e9 100644
--- a/src/sksl/SkSLStringStream.h
+++ b/src/sksl/SkSLStringStream.h
@@ -82,6 +82,6 @@
#endif // SKSL_STANDALONE
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/SkSLUtil.cpp b/src/sksl/SkSLUtil.cpp
index dca493e..f5d13ec 100644
--- a/src/sksl/SkSLUtil.cpp
+++ b/src/sksl/SkSLUtil.cpp
@@ -95,4 +95,4 @@
}
#endif
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/SkSLUtil.h b/src/sksl/SkSLUtil.h
index 1c316a2..2abba7d 100644
--- a/src/sksl/SkSLUtil.h
+++ b/src/sksl/SkSLUtil.h
@@ -419,6 +419,6 @@
NORETURN void sksl_abort();
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLBinaryExpression.h b/src/sksl/ir/SkSLBinaryExpression.h
index 1a0c1a6..dfa7f4c 100644
--- a/src/sksl/ir/SkSLBinaryExpression.h
+++ b/src/sksl/ir/SkSLBinaryExpression.h
@@ -96,6 +96,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLBlock.h b/src/sksl/ir/SkSLBlock.h
index b9fdf29..4c89244 100644
--- a/src/sksl/ir/SkSLBlock.h
+++ b/src/sksl/ir/SkSLBlock.h
@@ -72,6 +72,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLBoolLiteral.h b/src/sksl/ir/SkSLBoolLiteral.h
index 056aae2..3d07a23 100644
--- a/src/sksl/ir/SkSLBoolLiteral.h
+++ b/src/sksl/ir/SkSLBoolLiteral.h
@@ -56,6 +56,6 @@
, fValue(value) {}
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLBreakStatement.h b/src/sksl/ir/SkSLBreakStatement.h
index daedece..2d5af27 100644
--- a/src/sksl/ir/SkSLBreakStatement.h
+++ b/src/sksl/ir/SkSLBreakStatement.h
@@ -35,6 +35,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLConstructor.h b/src/sksl/ir/SkSLConstructor.h
index 6f23276..342b720 100644
--- a/src/sksl/ir/SkSLConstructor.h
+++ b/src/sksl/ir/SkSLConstructor.h
@@ -238,6 +238,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLContinueStatement.h b/src/sksl/ir/SkSLContinueStatement.h
index 1e01ac8..7946310 100644
--- a/src/sksl/ir/SkSLContinueStatement.h
+++ b/src/sksl/ir/SkSLContinueStatement.h
@@ -35,6 +35,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLDiscardStatement.h b/src/sksl/ir/SkSLDiscardStatement.h
index 8cc7e3f..9352788 100644
--- a/src/sksl/ir/SkSLDiscardStatement.h
+++ b/src/sksl/ir/SkSLDiscardStatement.h
@@ -35,6 +35,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLDoStatement.h b/src/sksl/ir/SkSLDoStatement.h
index 474aac7..b724ed9 100644
--- a/src/sksl/ir/SkSLDoStatement.h
+++ b/src/sksl/ir/SkSLDoStatement.h
@@ -42,6 +42,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLEnum.h b/src/sksl/ir/SkSLEnum.h
index e937d00..3863099 100644
--- a/src/sksl/ir/SkSLEnum.h
+++ b/src/sksl/ir/SkSLEnum.h
@@ -63,6 +63,6 @@
typedef ProgramElement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLExpression.h b/src/sksl/ir/SkSLExpression.h
index 1dbbb54..35a5966 100644
--- a/src/sksl/ir/SkSLExpression.h
+++ b/src/sksl/ir/SkSLExpression.h
@@ -161,6 +161,6 @@
typedef IRNode INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLExpressionStatement.h b/src/sksl/ir/SkSLExpressionStatement.h
index 1732bbb..5890f0f 100644
--- a/src/sksl/ir/SkSLExpressionStatement.h
+++ b/src/sksl/ir/SkSLExpressionStatement.h
@@ -38,6 +38,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLExtension.h b/src/sksl/ir/SkSLExtension.h
index 5eed975..170adee 100644
--- a/src/sksl/ir/SkSLExtension.h
+++ b/src/sksl/ir/SkSLExtension.h
@@ -33,6 +33,6 @@
typedef ProgramElement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLExternalFunctionCall.h b/src/sksl/ir/SkSLExternalFunctionCall.h
index bf70561..7acac69 100644
--- a/src/sksl/ir/SkSLExternalFunctionCall.h
+++ b/src/sksl/ir/SkSLExternalFunctionCall.h
@@ -73,6 +73,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLExternalValueReference.h b/src/sksl/ir/SkSLExternalValueReference.h
index 868c6c9..82e427b 100644
--- a/src/sksl/ir/SkSLExternalValueReference.h
+++ b/src/sksl/ir/SkSLExternalValueReference.h
@@ -42,6 +42,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLFieldAccess.h b/src/sksl/ir/SkSLFieldAccess.h
index 6cba566..b139ea3 100644
--- a/src/sksl/ir/SkSLFieldAccess.h
+++ b/src/sksl/ir/SkSLFieldAccess.h
@@ -55,6 +55,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLFloatLiteral.h b/src/sksl/ir/SkSLFloatLiteral.h
index 4ace0a0..685a284 100644
--- a/src/sksl/ir/SkSLFloatLiteral.h
+++ b/src/sksl/ir/SkSLFloatLiteral.h
@@ -66,6 +66,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLForStatement.h b/src/sksl/ir/SkSLForStatement.h
index 29c61bf..1e7e0e9 100644
--- a/src/sksl/ir/SkSLForStatement.h
+++ b/src/sksl/ir/SkSLForStatement.h
@@ -82,6 +82,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLFunctionCall.h b/src/sksl/ir/SkSLFunctionCall.h
index 7f7e7c5..f2f979a 100644
--- a/src/sksl/ir/SkSLFunctionCall.h
+++ b/src/sksl/ir/SkSLFunctionCall.h
@@ -77,6 +77,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLFunctionDeclaration.h b/src/sksl/ir/SkSLFunctionDeclaration.h
index c60af3e..1eedb7c 100644
--- a/src/sksl/ir/SkSLFunctionDeclaration.h
+++ b/src/sksl/ir/SkSLFunctionDeclaration.h
@@ -118,6 +118,6 @@
typedef Symbol INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLFunctionDefinition.h b/src/sksl/ir/SkSLFunctionDefinition.h
index 19854cd..a3488b1 100644
--- a/src/sksl/ir/SkSLFunctionDefinition.h
+++ b/src/sksl/ir/SkSLFunctionDefinition.h
@@ -60,6 +60,6 @@
typedef ProgramElement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLFunctionReference.h b/src/sksl/ir/SkSLFunctionReference.h
index acdf5ee..ae0bfdb 100644
--- a/src/sksl/ir/SkSLFunctionReference.h
+++ b/src/sksl/ir/SkSLFunctionReference.h
@@ -46,6 +46,6 @@
: INHERITED(offset, kFunctionReference_Kind, *type)
, fFunctions(function) {}};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLIRNode.h b/src/sksl/ir/SkSLIRNode.h
index 618f3ed..553eea2 100644
--- a/src/sksl/ir/SkSLIRNode.h
+++ b/src/sksl/ir/SkSLIRNode.h
@@ -35,6 +35,6 @@
int fOffset;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLIfStatement.h b/src/sksl/ir/SkSLIfStatement.h
index 6af6740..bfb158b 100644
--- a/src/sksl/ir/SkSLIfStatement.h
+++ b/src/sksl/ir/SkSLIfStatement.h
@@ -56,6 +56,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLIndexExpression.h b/src/sksl/ir/SkSLIndexExpression.h
index 5e7a011..a2c51ed 100644
--- a/src/sksl/ir/SkSLIndexExpression.h
+++ b/src/sksl/ir/SkSLIndexExpression.h
@@ -80,6 +80,6 @@
, fIndex(std::move(index)) {}
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLIntLiteral.h b/src/sksl/ir/SkSLIntLiteral.h
index 4641939..3b12cfb 100644
--- a/src/sksl/ir/SkSLIntLiteral.h
+++ b/src/sksl/ir/SkSLIntLiteral.h
@@ -69,6 +69,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLInterfaceBlock.h b/src/sksl/ir/SkSLInterfaceBlock.h
index 3dfd9fd..ec2875e 100644
--- a/src/sksl/ir/SkSLInterfaceBlock.h
+++ b/src/sksl/ir/SkSLInterfaceBlock.h
@@ -78,6 +78,6 @@
typedef ProgramElement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLLayout.h b/src/sksl/ir/SkSLLayout.h
index 829c356..9f82f3b 100644
--- a/src/sksl/ir/SkSLLayout.h
+++ b/src/sksl/ir/SkSLLayout.h
@@ -418,6 +418,6 @@
CType fCType;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLModifiers.h b/src/sksl/ir/SkSLModifiers.h
index 11a601c..e171e03 100644
--- a/src/sksl/ir/SkSLModifiers.h
+++ b/src/sksl/ir/SkSLModifiers.h
@@ -115,6 +115,6 @@
int fFlags;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLModifiersDeclaration.h b/src/sksl/ir/SkSLModifiersDeclaration.h
index 1dc7414..2e7c05d 100644
--- a/src/sksl/ir/SkSLModifiersDeclaration.h
+++ b/src/sksl/ir/SkSLModifiersDeclaration.h
@@ -36,6 +36,6 @@
typedef ProgramElement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLNop.h b/src/sksl/ir/SkSLNop.h
index 787060d..8316dc3 100644
--- a/src/sksl/ir/SkSLNop.h
+++ b/src/sksl/ir/SkSLNop.h
@@ -39,6 +39,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLNullLiteral.h b/src/sksl/ir/SkSLNullLiteral.h
index 8bf7960..45cbe86 100644
--- a/src/sksl/ir/SkSLNullLiteral.h
+++ b/src/sksl/ir/SkSLNullLiteral.h
@@ -50,6 +50,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLPostfixExpression.h b/src/sksl/ir/SkSLPostfixExpression.h
index c6f89eb..acffe65 100644
--- a/src/sksl/ir/SkSLPostfixExpression.h
+++ b/src/sksl/ir/SkSLPostfixExpression.h
@@ -48,6 +48,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLPrefixExpression.h b/src/sksl/ir/SkSLPrefixExpression.h
index 08f8bd4..784e1f8 100644
--- a/src/sksl/ir/SkSLPrefixExpression.h
+++ b/src/sksl/ir/SkSLPrefixExpression.h
@@ -82,6 +82,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLProgram.h b/src/sksl/ir/SkSLProgram.h
index cf16d1f..cf32389 100644
--- a/src/sksl/ir/SkSLProgram.h
+++ b/src/sksl/ir/SkSLProgram.h
@@ -304,6 +304,6 @@
friend class Compiler;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLProgramElement.h b/src/sksl/ir/SkSLProgramElement.h
index 4caaebe..0b60d95 100644
--- a/src/sksl/ir/SkSLProgramElement.h
+++ b/src/sksl/ir/SkSLProgramElement.h
@@ -39,6 +39,6 @@
typedef IRNode INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLReturnStatement.h b/src/sksl/ir/SkSLReturnStatement.h
index 82b4678..93cd475 100644
--- a/src/sksl/ir/SkSLReturnStatement.h
+++ b/src/sksl/ir/SkSLReturnStatement.h
@@ -48,6 +48,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLSection.h b/src/sksl/ir/SkSLSection.h
index 2085612..f3828ff 100644
--- a/src/sksl/ir/SkSLSection.h
+++ b/src/sksl/ir/SkSLSection.h
@@ -42,6 +42,6 @@
typedef ProgramElement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLSetting.cpp b/src/sksl/ir/SkSLSetting.cpp
index 1cb0d4a..4ebf390 100644
--- a/src/sksl/ir/SkSLSetting.cpp
+++ b/src/sksl/ir/SkSLSetting.cpp
@@ -19,4 +19,4 @@
return nullptr;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/ir/SkSLSetting.h b/src/sksl/ir/SkSLSetting.h
index 50c2943..3c71c52 100644
--- a/src/sksl/ir/SkSLSetting.h
+++ b/src/sksl/ir/SkSLSetting.h
@@ -54,6 +54,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLStatement.h b/src/sksl/ir/SkSLStatement.h
index 2260cdd..5087c72 100644
--- a/src/sksl/ir/SkSLStatement.h
+++ b/src/sksl/ir/SkSLStatement.h
@@ -49,6 +49,6 @@
typedef IRNode INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLSwitchCase.h b/src/sksl/ir/SkSLSwitchCase.h
index dcfe956..00bc0aa 100644
--- a/src/sksl/ir/SkSLSwitchCase.h
+++ b/src/sksl/ir/SkSLSwitchCase.h
@@ -64,6 +64,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLSwitchStatement.h b/src/sksl/ir/SkSLSwitchStatement.h
index a85420a..5bc33fa 100644
--- a/src/sksl/ir/SkSLSwitchStatement.h
+++ b/src/sksl/ir/SkSLSwitchStatement.h
@@ -68,6 +68,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLSwizzle.h b/src/sksl/ir/SkSLSwizzle.h
index 4e12bee..afd30c7 100644
--- a/src/sksl/ir/SkSLSwizzle.h
+++ b/src/sksl/ir/SkSLSwizzle.h
@@ -162,6 +162,6 @@
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLSymbol.h b/src/sksl/ir/SkSLSymbol.h
index df606b8..f7e4222 100644
--- a/src/sksl/ir/SkSLSymbol.h
+++ b/src/sksl/ir/SkSLSymbol.h
@@ -38,6 +38,6 @@
typedef IRNode INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLSymbolTable.cpp b/src/sksl/ir/SkSLSymbolTable.cpp
index 71bdebd..d9ef4f6 100644
--- a/src/sksl/ir/SkSLSymbolTable.cpp
+++ b/src/sksl/ir/SkSLSymbolTable.cpp
@@ -108,4 +108,4 @@
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/ir/SkSLSymbolTable.h b/src/sksl/ir/SkSLSymbolTable.h
index 53dd84e..6b5b5ef 100644
--- a/src/sksl/ir/SkSLSymbolTable.h
+++ b/src/sksl/ir/SkSLSymbolTable.h
@@ -75,6 +75,6 @@
friend class Dehydrator;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLTernaryExpression.h b/src/sksl/ir/SkSLTernaryExpression.h
index cb4c004..4a0cd99 100644
--- a/src/sksl/ir/SkSLTernaryExpression.h
+++ b/src/sksl/ir/SkSLTernaryExpression.h
@@ -58,6 +58,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLType.cpp b/src/sksl/ir/SkSLType.cpp
index edff101..03eac85 100644
--- a/src/sksl/ir/SkSLType.cpp
+++ b/src/sksl/ir/SkSLType.cpp
@@ -200,4 +200,4 @@
return *context.fVoid_Type;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/ir/SkSLType.h b/src/sksl/ir/SkSLType.h
index e8c6a65..a40161b 100644
--- a/src/sksl/ir/SkSLType.h
+++ b/src/sksl/ir/SkSLType.h
@@ -441,6 +441,6 @@
const Type* fTextureType = nullptr;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLTypeReference.h b/src/sksl/ir/SkSLTypeReference.h
index 5c19f28e..86da895 100644
--- a/src/sksl/ir/SkSLTypeReference.h
+++ b/src/sksl/ir/SkSLTypeReference.h
@@ -44,6 +44,6 @@
, fValue(value) {}
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLUnresolvedFunction.h b/src/sksl/ir/SkSLUnresolvedFunction.h
index d32cd42..a24750b 100644
--- a/src/sksl/ir/SkSLUnresolvedFunction.h
+++ b/src/sksl/ir/SkSLUnresolvedFunction.h
@@ -35,6 +35,6 @@
typedef Symbol INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLVarDeclarations.h b/src/sksl/ir/SkSLVarDeclarations.h
index e9ba039..2c0aa33 100644
--- a/src/sksl/ir/SkSLVarDeclarations.h
+++ b/src/sksl/ir/SkSLVarDeclarations.h
@@ -146,6 +146,6 @@
typedef ProgramElement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLVarDeclarationsStatement.h b/src/sksl/ir/SkSLVarDeclarationsStatement.h
index eb7880f..2c333fc 100644
--- a/src/sksl/ir/SkSLVarDeclarationsStatement.h
+++ b/src/sksl/ir/SkSLVarDeclarationsStatement.h
@@ -48,6 +48,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLVariableReference.cpp b/src/sksl/ir/SkSLVariableReference.cpp
index a888f95..ca8664f 100644
--- a/src/sksl/ir/SkSLVariableReference.cpp
+++ b/src/sksl/ir/SkSLVariableReference.cpp
@@ -111,4 +111,4 @@
return nullptr;
}
-} // namespace
+} // namespace SkSL
diff --git a/src/sksl/ir/SkSLVariableReference.h b/src/sksl/ir/SkSLVariableReference.h
index 6da2ce6..e27da9f 100644
--- a/src/sksl/ir/SkSLVariableReference.h
+++ b/src/sksl/ir/SkSLVariableReference.h
@@ -84,6 +84,6 @@
typedef Expression INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/sksl/ir/SkSLWhileStatement.h b/src/sksl/ir/SkSLWhileStatement.h
index 0782a01..f30c8c8 100644
--- a/src/sksl/ir/SkSLWhileStatement.h
+++ b/src/sksl/ir/SkSLWhileStatement.h
@@ -42,6 +42,6 @@
typedef Statement INHERITED;
};
-} // namespace
+} // namespace SkSL
#endif
diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp
index d1fe42b..652ccd6 100644
--- a/src/svg/SkSVGDevice.cpp
+++ b/src/svg/SkSVGDevice.cpp
@@ -463,7 +463,7 @@
constexpr uint8_t kPngSig[] = { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A };
return length >= sizeof(kPngSig) && !memcmp(bytes, kPngSig, sizeof(kPngSig));
}
-}
+} // namespace
// Returns data uri from bytes.
// it will use any cached data if available, otherwise will
diff --git a/src/utils/SkDashPathPriv.h b/src/utils/SkDashPathPriv.h
index 5c6a5db..3eaaef4 100644
--- a/src/utils/SkDashPathPriv.h
+++ b/src/utils/SkDashPathPriv.h
@@ -47,6 +47,6 @@
StrokeRecApplication = StrokeRecApplication::kAllow);
bool ValidDashPath(SkScalar phase, const SkScalar intervals[], int32_t count);
-}
+} // namespace SkDashPath
#endif
diff --git a/src/utils/SkMultiPictureDocument.cpp b/src/utils/SkMultiPictureDocument.cpp
index 8a47be1..c78ed59 100644
--- a/src/utils/SkMultiPictureDocument.cpp
+++ b/src/utils/SkMultiPictureDocument.cpp
@@ -94,7 +94,7 @@
fSizes.reset();
}
};
-}
+} // namespace
sk_sp<SkDocument> SkMakeMultiPictureDocument(SkWStream* wStream, const SkSerialProcs* procs) {
return sk_make_sp<MultiPictureDocument>(wStream, procs);
diff --git a/src/utils/SkPatchUtils.cpp b/src/utils/SkPatchUtils.cpp
index bd88385..b645d41 100644
--- a/src/utils/SkPatchUtils.cpp
+++ b/src/utils/SkPatchUtils.cpp
@@ -45,7 +45,7 @@
kBottomRight_Corner,
kBottomLeft_Corner
};
-}
+} // namespace
/**
* Evaluator to sample the values of a cubic bezier using forward differences.
diff --git a/src/utils/SkShadowTessellator.h b/src/utils/SkShadowTessellator.h
index 92faccc..b08cec1 100644
--- a/src/utils/SkShadowTessellator.h
+++ b/src/utils/SkShadowTessellator.h
@@ -39,6 +39,6 @@
const SkPoint3& lightPos, SkScalar lightRadius, bool transparent);
-}
+} // namespace SkShadowTessellator
#endif
diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp
index 3710f1e..6ef6781 100644
--- a/src/utils/SkShadowUtils.cpp
+++ b/src/utils/SkShadowUtils.cpp
@@ -492,7 +492,7 @@
return true;
}
-}
+} // namespace
static bool tilted(const SkPoint3& zPlaneParams) {
return !SkScalarNearlyZero(zPlaneParams.fX) || !SkScalarNearlyZero(zPlaneParams.fY);