commit 19eb8435cbce1200667024079750c6494b02079f
author Mike Klein <mtklein@chromium.org> Mon Sep 26 13:02:35 2016 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 26 17:43:10 2016 +0000
tree bb6f3dfbe25ac6de44d6db352704a5b1a1bf8dd5
parent e1a5f4e292384046678edc5c1e360b3e13dc118c

-Wcomma may be good to go now.

This cleans up 3 remaining sites using , that probably meant ;

BUG=skia:

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2605

Change-Id: I5e48bcd85d72a205d2b0c860461dab1ec793dd18
Reviewed-on: https://skia-review.googlesource.com/2605
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

gn/BUILD.gn

diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 9ffbf49..55e6d2c 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -85,7 +85,6 @@
 
       # High priority to fix!
       cflags += [
-        "-Wno-comma",
         "-Wno-conditional-uninitialized",
         "-Wno-covered-switch-default",
         "-Wno-deprecated",

src/gpu/GrMemoryPool.cpp

diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/GrMemoryPool.cpp
index ee54f6b..6bc0f54 100644
--- a/src/gpu/GrMemoryPool.cpp
+++ b/src/gpu/GrMemoryPool.cpp
@@ -18,7 +18,7 @@
     SkDEBUGCODE(fAllocBlockCnt = 0);
 
     minAllocSize = SkTMax<size_t>(minAllocSize, 1 << 10);
-    fMinAllocSize = GrSizeAlignUp(minAllocSize + kPerAllocPad, kAlignment),
+    fMinAllocSize = GrSizeAlignUp(minAllocSize + kPerAllocPad, kAlignment);
     fPreallocSize = GrSizeAlignUp(preallocSize + kPerAllocPad, kAlignment);
     fPreallocSize = SkTMax(fPreallocSize, fMinAllocSize);
     fSize = 0;

tests/PathOpsSimplifyFailTest.cpp

diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp
index 0166a84..359b125 100644
--- a/tests/PathOpsSimplifyFailTest.cpp
+++ b/tests/PathOpsSimplifyFailTest.cpp
@@ -161,7 +161,7 @@
 #define TEST(test) test(reporter, #test)
 
 DEF_TEST(PathOpsSimplifyFail, reporter) {
-    TEST(fuzz763_1),
+    TEST(fuzz763_1);
     TEST(fuzz_x2);
     TEST(fuzz_x1);
     TEST(fuzz_59);

tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp

diff --git a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
index 1da245d..9cff0b7 100644
--- a/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
+++ b/tools/gpu/gl/glx/CreatePlatformGLTestContext_glx.cpp
@@ -149,8 +149,10 @@
             //       " SAMPLES = %d\n",
             //        i, (unsigned int)vi->visualid, samp_buf, samples);
 
-            if (best_fbc < 0 || (samp_buf && samples > best_num_samp))
-                best_fbc = i, best_num_samp = samples;
+            if (best_fbc < 0 || (samp_buf && samples > best_num_samp)) {
+                best_fbc = i;
+                best_num_samp = samples;
+            }
         }
         XFree(vi);
     }