Cleanup: Remove unnecessary double-semicolons.

The entries were found by the following command line:

$ find . -regex ".*\.[cChH]\(pp\)?" | xargs git grep -e ';;' --and --not
-e 'for *(.*;;'

Which is a combination of http://stackoverflow.com/a/3858879 and
http://gitster.livejournal.com/27674.html

BUG=None
R=mtklein@google.com

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

13 files changed, 14 insertions, 14 deletions

diff --git a/experimental/PdfViewer/src/SkPdfRenderer.cpp b/experimental/PdfViewer/src/SkPdfRenderer.cpp
index ead65039a6..6a9fd74aba 100644
--- a/experimental/PdfViewer/src/SkPdfRenderer.cpp
+++ b/experimental/PdfViewer/src/SkPdfRenderer.cpp
@@ -1069,7 +1069,7 @@ static SkPdfResult PdfOp_Tm(SkPdfContext* pdfContext, SkCanvas* canvas, SkPdfTok
                 "Text positioning not implemented for 2+ chars", NULL, pdfContext);
 
     pdfContext->fGraphicsState.fMatrixTm = matrix;
-    pdfContext->fGraphicsState.fMatrixTlm = matrix;;
+    pdfContext->fGraphicsState.fMatrixTlm = matrix;
 
     return kPartial_SkPdfResult;
 }
diff --git a/gm/bitmappremul.cpp b/gm/bitmappremul.cpp
index b87f749b06..172612ddb0 100644
--- a/gm/bitmappremul.cpp
+++ b/gm/bitmappremul.cpp
@@ -84,7 +84,7 @@ static SkBitmap make_argb8888_stripes() {
 static SkBitmap make_argb4444_stripes() {
     SkBitmap bitmap;
     init_bitmap(kARGB_4444_SkColorType, &bitmap);
-    uint8_t rowColor = 0;;
+    uint8_t rowColor = 0;
     for (int y = 0; y < SLIDE_SIZE; y++) {
         uint16_t* dst = bitmap.getAddr16(0, y);
         for (int x = 0; x < SLIDE_SIZE; x++) {
diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp
index f31b698566..0e11b0653f 100644
--- a/gm/multipicturedraw.cpp
+++ b/gm/multipicturedraw.cpp
@@ -154,7 +154,7 @@ static const SkPicture* make_tri_picture() {
 
     SkPaint fill;
     fill.setStyle(SkPaint::kFill_Style);
-    fill.setColor(SK_ColorLTGRAY);;
+    fill.setColor(SK_ColorLTGRAY);
 
     SkPaint stroke;
     stroke.setStyle(SkPaint::kStroke_Style);
diff --git a/gm/textblobtransforms.cpp b/gm/textblobtransforms.cpp
index 8347e9be60..d24e6e860e 100644
--- a/gm/textblobtransforms.cpp
+++ b/gm/textblobtransforms.cpp
@@ -32,7 +32,7 @@ protected:
 
         SkRect bounds;
         paint.measureText(text, strlen(text), &bounds);
-        sk_tool_utils::add_to_text_blob(&builder, text, paint, 0, 0);;
+        sk_tool_utils::add_to_text_blob(&builder, text, paint, 0, 0);
 
         // Medium
         SkScalar xOffset = bounds.width() + 5;
diff --git a/include/core/SkTArray.h b/include/core/SkTArray.h
index dea0e38fec..a035f6e9af 100644
--- a/include/core/SkTArray.h
+++ b/include/core/SkTArray.h
@@ -300,7 +300,7 @@ public:
         return fItemArray ? fItemArray + fCount : NULL;
     }
     const T* end() const {
-        return fItemArray ? fItemArray + fCount : NULL;;
+        return fItemArray ? fItemArray + fCount : NULL;
     }
 
    /**
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index c8c651f638..6f90b71054 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -704,7 +704,7 @@ void SkBitmap::internalErase(const SkIRect& area,
         }
         case kARGB_4444_SkColorType:
         case kRGB_565_SkColorType: {
-            uint16_t* p = this->getAddr16(area.fLeft, area.fTop);;
+            uint16_t* p = this->getAddr16(area.fLeft, area.fTop);
             uint16_t v;
 
             // make rgb premultiplied
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 7f79c45050..bbf3f44896 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -76,7 +76,7 @@ SkTypeface* sk_create_default_typeface(int style) {
     SkAutoMutexAcquire lock(&gCreateDefaultMutex);
 
     SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
-    SkTypeface* t = fm->legacyCreateTypeface(NULL, style);;
+    SkTypeface* t = fm->legacyCreateTypeface(NULL, style);
     return t ? t : SkEmptyTypeface::Create();
 }
 
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index c21366f736..1d07b9eec2 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -570,7 +570,7 @@ public:
     /**
      * Used to populate the vertex and index buffer on the draw info before onDraw is called.
      */
-    virtual void setDrawBuffers(DrawInfo*, size_t vertexStride) = 0;;
+    virtual void setDrawBuffers(DrawInfo*, size_t vertexStride) = 0;
     bool programUnitTest(int maxStages);
 
 protected:
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 4d333503ca..d22b4628bb 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -110,7 +110,7 @@ public:
 
             // emit transforms
             this->emitTransforms(args.fPB, gpArgs->fPositionVar, ce.inPosition()->fName,
-                                 ce.localMatrix(), args.fTransformsIn, args.fTransformsOut);;
+                                 ce.localMatrix(), args.fTransformsIn, args.fTransformsOut);
 
             GrGLGPFragmentBuilder* fsBuilder = args.fPB->getFragmentShaderBuilder();
             fsBuilder->codeAppendf("float d = length(%s.xy);", v.fsIn());
diff --git a/src/images/SkImageDecoder_wbmp.cpp b/src/images/SkImageDecoder_wbmp.cpp
index d6d4f828e0..b7a6790ed8 100644
--- a/src/images/SkImageDecoder_wbmp.cpp
+++ b/src/images/SkImageDecoder_wbmp.cpp
@@ -93,7 +93,7 @@ static void expand_bits_to_bytes(uint8_t dst[], const uint8_t src[], int bits)
     if (bits > 0) {
         unsigned mask = *src;
         do {
-            *dst++ = (mask >> 7) & 1;;
+            *dst++ = (mask >> 7) & 1;
             mask <<= 1;
         } while (--bits != 0);
     }
diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp
index 6650751f3a..f44557819c 100644
--- a/src/ports/SkTypeface_win_dw.cpp
+++ b/src/ports/SkTypeface_win_dw.cpp
@@ -366,7 +366,7 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
     } else {
         info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
         info->fItalicAngle = 0;
-        info->fAscent = dwfm.ascent;;
+        info->fAscent = dwfm.ascent;
         info->fDescent = dwfm.descent;
         info->fStemV = 0;
         info->fCapHeight = dwfm.capHeight;
@@ -380,7 +380,7 @@ SkAdvancedTypefaceMetrics* DWriteFontTypeface::onGetAdvancedTypefaceMetrics(
     AutoTDWriteTable<SkOTTableOS2> os2Table(fDWriteFontFace.get());
     if (!headTable.fExists || !postTable.fExists || !hheaTable.fExists || !os2Table.fExists) {
         info->fItalicAngle = 0;
-        info->fAscent = dwfm.ascent;;
+        info->fAscent = dwfm.ascent;
         info->fDescent = dwfm.descent;
         info->fStemV = 0;
         info->fCapHeight = dwfm.capHeight;
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 646d5150e9..7a4a8ffe5a 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -119,7 +119,7 @@ public:
     { }
 
     SkRect fRect;
-    SkMatrix fMatrix;;
+    SkMatrix fMatrix;
     SkPath fPath;
     SkPath fNearlyZeroLengthPath;
     SkIRect fIRect;
diff --git a/tests/HashTest.cpp b/tests/HashTest.cpp
index c1bdf884d8..848986162d 100644
--- a/tests/HashTest.cpp
+++ b/tests/HashTest.cpp
@@ -42,7 +42,7 @@ DEF_TEST(HashMap, r) {
         map.set(i, 2.0*i);
     }
     for (int i = 0; i < N; i++) {
-        double* found = map.find(i);;
+        double* found = map.find(i);
         REPORTER_ASSERT(r, found);
         REPORTER_ASSERT(r, *found == i*2.0);
     }