Revert of Tag checkerboard bitmaps as sRGB

tools/sk_tool_utils.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "sk_tool_utils_flags.h"
 
@@ skipping 182 matching lines @@
     SkBitmap tmp(bitmap);
     tmp.lockPixels();
 
     const SkImageInfo info = SkImageInfo::Make(tmp.width(), tmp.height(), colorType, alphaType);
 
     canvas->writePixels(info, tmp.getPixels(), tmp.rowBytes(), x, y);
 }
 
 sk_sp<SkShader> create_checkerboard_shader(SkColor c1, SkColor c2, int size) {
     SkBitmap bm;
-    bm.allocPixels(SkImageInfo::MakeS32(2 * size, 2 * size, kPremul_SkAlphaType));
+    bm.allocN32Pixels(2 * size, 2 * size);
     bm.eraseColor(c1);
     bm.eraseArea(SkIRect::MakeLTRB(0, 0, size, size), c2);
     bm.eraseArea(SkIRect::MakeLTRB(size, size, 2 * size, 2 * size), c2);
     return SkShader::MakeBitmapShader(
             bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode);
 }
 
 SkBitmap create_checkerboard_bitmap(int w, int h, SkColor c1, SkColor c2, int checkSize) {
     SkBitmap bitmap;
-    bitmap.allocPixels(SkImageInfo::MakeS32(w, h, kPremul_SkAlphaType));
+    bitmap.allocN32Pixels(w, h);
     SkCanvas canvas(bitmap);
 
     sk_tool_utils::draw_checkerboard(&canvas, c1, c2, checkSize);
     return bitmap;
 }
 
 void draw_checkerboard(SkCanvas* canvas, SkColor c1, SkColor c2, int size) {
     SkPaint paint;
     paint.setShader(create_checkerboard_shader(c1, c2, size));
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
@@ skipping 315 matching lines @@
     const SkVector& ll = rr.radii(SkRRect::kLowerLeft_Corner);
 
     SkScalar maxL = SkTMax(ul.fX, ll.fX);
     SkScalar maxR = SkTMax(ur.fX, lr.fX);
 
     return SkRect::MakeLTRB(r.fLeft + maxL, r.fTop, r.fRight - maxR, r.fBottom);
 }
 
 
 }  // namespace sk_tool_utils