diff options
| -rw-r--r-- | tools/skpmaker.cpp | 11 | ||||
| -rwxr-xr-x | tools/tests/render_pictures_test.py | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tools/skpmaker.cpp b/tools/skpmaker.cpp index 467f7b42d3..00082075c7 100644 --- a/tools/skpmaker.cpp +++ b/tools/skpmaker.cpp @@ -17,20 +17,25 @@ // Flags used by this file, alphabetically: DEFINE_int32(blue, 128, "Value of blue color channel in image, 0-255."); +DEFINE_int32(border, 4, "Width of the black border around the image."); DEFINE_int32(green, 128, "Value of green color channel in image, 0-255."); DEFINE_int32(height, 200, "Height of canvas to create."); DEFINE_int32(red, 128, "Value of red color channel in image, 0-255."); DEFINE_int32(width, 300, "Width of canvas to create."); DEFINE_string(writePath, "", "Filepath to write the SKP into."); -static void skpmaker(int width, int height, SkColor color, +static void skpmaker(int width, int height, int border, SkColor color, const char *writePath) { SkPicture pict; SkCanvas* canvas = pict.beginRecording(width, height); SkPaint paint; paint.setStyle(SkPaint::kFill_Style); - paint.setColor(color); + paint.setColor(SK_ColorBLACK); canvas->drawRectCoords(0, 0, SkIntToScalar(width), SkIntToScalar(height), paint); + paint.setColor(color); + canvas->drawRectCoords(SkIntToScalar(border), SkIntToScalar(border), + SkIntToScalar(width - border*2), SkIntToScalar(height - border*2), + paint); pict.endRecording(); SkFILEWStream stream(writePath); pict.serialize(&stream); @@ -68,7 +73,7 @@ int tool_main(int argc, char** argv) { } SkColor color = SkColorSetRGB(FLAGS_red, FLAGS_green, FLAGS_blue); - skpmaker(FLAGS_width, FLAGS_height, color, FLAGS_writePath[0]); + skpmaker(FLAGS_width, FLAGS_height, FLAGS_border, color, FLAGS_writePath[0]); return 0; } diff --git a/tools/tests/render_pictures_test.py b/tools/tests/render_pictures_test.py index 89ea228412..33c1e6a046 100755 --- a/tools/tests/render_pictures_test.py +++ b/tools/tests/render_pictures_test.py @@ -40,10 +40,11 @@ class RenderPicturesTest(base_unittest.TestCase): expected_summary_dict = { "actual-results" : { "no-comparison" : { - "input.png" : [ "bitmap-64bitMD5", 12793741875005523433 ] - } + # Manually verified: 640x400 red image with black border + "input.png" : [ "bitmap-64bitMD5", 11092453015575919668 ] } } + } self._assert_json_contents(output_json_path, expected_summary_dict) def test_tiled_no_comparison(self): |