replace COMPILE_ASSERT with static_assert in skia/

BUG=442514

Review URL: https://codereview.chromium.org/823403002

Cr-Commit-Position: refs/heads/master@{#310027}

2 files changed, 6 insertions, 5 deletions

diff --git a/skia/ext/convolver.h b/skia/ext/convolver.h
index ace8c21..1f61f23 100644
--- a/skia/ext/convolver.h
+++ b/skia/ext/convolver.h
@@ -60,7 +60,8 @@ class ConvolutionFilter1D {
     // The cast relies on Fixed being a short, implying that on
     // the platforms we care about all (16) bits will fit into
     // the mantissa of a (32-bit) float.
-    COMPILE_ASSERT(sizeof(Fixed) == 2, fixed_type_should_fit_in_float_mantissa);
+    static_assert(sizeof(Fixed) == 2,
+                  "fixed type should fit in float mantissa");
     float raw = static_cast<float>(x);
     return ldexpf(raw, -kShiftBits);
   }
diff --git a/skia/ext/skia_utils_win.h b/skia/ext/skia_utils_win.h
index 98e1b99..6ac5234 100644
--- a/skia/ext/skia_utils_win.h
+++ b/skia/ext/skia_utils_win.h
@@ -24,15 +24,15 @@ POINT SkPointToPOINT(const SkPoint& point);
 SkRect RECTToSkRect(const RECT& rect);
 
 // Converts a Windows RECT to a Skia rect.
-// Both use same in-memory format. Verified by COMPILE_ASSERT() in
-// skia_utils.cc.
+// Both use same in-memory format. Verified by SK_COMPILE_ASSERT() in
+// skia_utils_win.cc.
 inline const SkIRect& RECTToSkIRect(const RECT& rect) {
   return reinterpret_cast<const SkIRect&>(rect);
 }
 
 // Converts a Skia rect to a Windows RECT.
-// Both use same in-memory format. Verified by COMPILE_ASSERT() in
-// skia_utils.cc.
+// Both use same in-memory format. Verified by SK_COMPILE_ASSERT() in
+// skia_utils_win.cc.
 inline const RECT& SkIRectToRECT(const SkIRect& rect) {
   return reinterpret_cast<const RECT&>(rect);
 }