commit 2335644771ebfdb44fbcadd289f1ed0e63c8ea67
author Brian Salomon <bsalomon@google.com> Fri Nov 30 15:33:19 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 30 23:23:09 2018 +0000
tree 7af363bed4b52aec08bb1625a42a6cfc7e797547
parent 64284e14827d8768e54582c0d8c81d0d33594f7c

Fix occurrences of "-Wextra-semi-stmt"

Docs-Preview: https://skia.org/?cl=173761
Change-Id: Iefdb91cd28eabb4b01b7b42a4f300b0b4caf05d9
Reviewed-on: https://skia-review.googlesource.com/c/173761
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

tests/GrMeshTest.cpp

diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 6762ddc..93b7983 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -87,8 +87,8 @@
             context->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
 
     sk_sp<GrRenderTargetContext> rtc(context->contextPriv().makeDeferredRenderTargetContext(
-                                                 format, SkBackingFit::kExact, kImageWidth,
-                                                 kImageHeight, kRGBA_8888_GrPixelConfig, nullptr));
+            format, SkBackingFit::kExact, kImageWidth, kImageHeight, kRGBA_8888_GrPixelConfig,
+            nullptr));
     if (!rtc) {
         ERRORF(reporter, "could not create render target context.");
         return;
@@ -112,17 +112,17 @@
             int rgb[3] = {-(c & 1) & 0xff, -((c >> 1) & 1) & 0xff, -((c >> 2) & 1) & 0xff};
 
             const Box box = boxes.push_back() = {
-                float(x * kBoxSize),
-                float(y * kBoxSize),
-                GrColorPackRGBA(rgb[0], rgb[1], rgb[2], 255)
+                    float(x * kBoxSize),
+                    float(y * kBoxSize),
+                    GrColorPackRGBA(rgb[0], rgb[1], rgb[2], 255)
             };
 
             std::array<Box, 4>& boxVertices = vertexData.push_back();
             for (int i = 0; i < 4; ++i) {
                 boxVertices[i] = {
-                    box.fX + (i/2) * kBoxSize,
-                    box.fY + (i%2) * kBoxSize,
-                    box.fColor
+                        box.fX + (i / 2) * kBoxSize,
+                        box.fY + (i % 2) * kBoxSize,
+                        box.fColor
                 };
             }
 
@@ -135,11 +135,13 @@
 
     // ---- tests ----------
 
-#define VALIDATE(buff) \
-    if (!buff) { \
-        ERRORF(reporter, #buff " is null."); \
-        return; \
-    }
+#define VALIDATE(buff)                           \
+    do {                                         \
+        if (!buff) {                             \
+            ERRORF(reporter, #buff " is null."); \
+            return;                              \
+        }                                        \
+    } while (0)
 
     run_test(context, "setNonIndexedNonInstanced", reporter, rtc, gold,
              [&](DrawMeshHelper* helper) {