Remove unmatched restore call in gamma GM

gm/gamma.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 
 #include "Resources.h"
@@ skipping 66 matching lines @@
                          textPaint);
         canvas->drawText(dstText.c_str(), dstText.size(), 0, sz + 3 * textPaint.getFontSpacing(),
                          textPaint);
         advance();
     };
 
     // Necessary for certain Xfermode tests to work (ie some of them output white @ 50% alpha):
     canvas->clear(SK_ColorBLACK);
 
     // *Everything* should be perceptually 50% grey. Only the first rectangle
     // is guaranteed to draw that way, though.

[robertphillips, 2016/04/26 21:27:53]

Doesn't it match this save ?

     canvas->save();
 
     // Black/white dither, pixel perfect. This is ground truth.
     p.setShader(SkShader::MakeBitmapShader(ditherBmp, rpt, rpt));
     p.setFilterQuality(SkFilterQuality::kNone_SkFilterQuality);
     nextRect("Dither", "Reference");
 
     // Black/white dither, sampled at half-texel offset. Tests bilerp.
     // NOTE: We need to apply a non-identity scale and/or rotation to trick
     // the raster pipeline into *not* snapping to nearest.
@@ skipping 34 matching lines @@
     p.setShader(SkShader::MakeBitmapShader(linearGreyBmp, rpt, rpt));
     p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
     nextRect("Lnr BMP", "Shader");
 
     // Bitmap wrapped in a shader (sRGB):
     p.setShader(SkShader::MakeBitmapShader(srgbGreyBmp, rpt, rpt));
     p.setFilterQuality(SkFilterQuality::kMedium_SkFilterQuality);
     nextRect("sRGB BMP", "Shader");
 
     // Carriage return.
     canvas->restore();

[Brian Osman, 2016/04/26 21:31:20]

Nope, this one does.

     canvas->translate(0, 2 * sz);
 
     const U8CPU sqrtHalf = 0xB4;
     const SkColor sqrtHalfAlpha = SkColorSetARGB(sqrtHalf, 0, 0, 0);
     const SkColor sqrtHalfWhite = SkColorSetARGB(0xFF, sqrtHalf, sqrtHalf, sqrtHalf);
 
     // Xfermode tests, all done off-screen so certain modes work...
 
     canvas->saveLayer(nullptr, nullptr);
 
     nextXferRect(0x7fffffff, SkXfermode::kSrcOver_Mode, SK_ColorBLACK);
     nextXferRect(0x7f000000, SkXfermode::kSrcOver_Mode, SK_ColorWHITE);
 
     nextXferRect(SK_ColorBLACK, SkXfermode::kDstOver_Mode, 0x7fffffff);
     nextXferRect(SK_ColorWHITE, SkXfermode::kSrcIn_Mode, 0x7fff00ff);
     nextXferRect(0x7fff00ff, SkXfermode::kDstIn_Mode, SK_ColorWHITE);
     nextXferRect(sqrtHalfWhite, SkXfermode::kSrcIn_Mode, sqrtHalfAlpha);
     nextXferRect(sqrtHalfAlpha, SkXfermode::kDstIn_Mode, sqrtHalfWhite);
 
     nextXferRect(0xff3f3f3f, SkXfermode::kPlus_Mode, 0xff3f3f3f);
     nextXferRect(sqrtHalfWhite, SkXfermode::kModulate_Mode, sqrtHalfWhite);
 
     canvas->restore();
-
-    canvas->restore();
 }