Minor code cleanup (left over from prior CL)

tools/sk_tool_utils.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef sk_tool_utils_DEFINED
 #define sk_tool_utils_DEFINED
 
@@ skipping 68 matching lines @@
     /** Call to clean up portable font references. */
     void release_portable_typefaces();
 
     /**
      *  Call canvas->writePixels() by using the pixels from bitmap, but with an info that claims
      *  the pixels are colorType + alphaType
      */
     void write_pixels(SkCanvas*, const SkBitmap&, int x, int y, SkColorType, SkAlphaType);
 
     // private to sk_tool_utils
-    SkTypeface* create_font(const char* name, SkTypeface::Style );
+    SkTypeface* create_font(const char* name, SkTypeface::Style);
 
     /** Returns a newly created CheckerboardShader. */
     SkShader* create_checkerboard_shader(SkColor c1, SkColor c2, int size);
 
     /** Draw a checkerboard pattern in the current canvas, restricted to
         the current clip, using SkXfermode::kSrc_Mode. */
     void draw_checkerboard(SkCanvas* canvas,
                            SkColor color1,
                            SkColor color2,
-                           int size);
+                           int checkSize);
+
+    /** Make it easier to create a bitmap-based checkerboard */
+    SkBitmap create_checkerboard_bitmap(int w, int h,
+                                        SkColor c1, SkColor c2,
+                                        int checkSize);
 
     /** A default checkerboard. */
     inline void draw_checkerboard(SkCanvas* canvas) {
         sk_tool_utils::draw_checkerboard(canvas, 0xFF999999, 0xFF666666, 8);
     }
 
+    SkBitmap create_string_bitmap(int w, int h, SkColor c, int x, int y,
+                                  int textSize, const char* str);
+
     // Encodes to PNG, unless there is already encoded data, in which case that gets
     // used.
     class PngPixelSerializer : public SkPixelSerializer {
     public:
         bool onUseEncodedData(const void*, size_t) override { return true; }
         SkData* onEncodePixels(const SkImageInfo& info, const void* pixels,
                                size_t rowBytes) override {
             return SkImageEncoder::EncodeData(info, pixels, rowBytes,
                                               SkImageEncoder::kPNG_Type, 100);
         }
     };
 
     // A helper for inserting a drawtext call into a SkTextBlobBuilder
     void add_to_text_blob(SkTextBlobBuilder* builder, const char* text, const SkPaint& origPaint,
                           SkScalar x, SkScalar y);
 
     void create_hemi_normal_map(SkBitmap* bm, const SkIRect& dst);
 
     void create_frustum_normal_map(SkBitmap* bm, const SkIRect& dst);
 
     void create_tetra_normal_map(SkBitmap* bm, const SkIRect& dst);
 
 }  // namespace sk_tool_utils
 
 #endif  // sk_tool_utils_DEFINED