Revert of skpmaker: make the SKP slightly more interesting (add a border) (https...

Reason for revert:
broke http://108.170.217.252:10117/builders/Build-Mac10.6-GCC-x86-Debug/builds/2837

Original issue's description:
> skpmaker: make the SKP slightly more interesting (add a border)
>
> This will help with render_pictures self-testing
> BUG=skia:1942
>
> Committed: http://code.google.com/p/skia/source/detail?r=13086

R=rmistry@google.com
TBR=rmistry@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1942

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@13087 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/tools/skpmaker.cpp b/tools/skpmaker.cpp
index 0008207..467f7b4 100644 (file)
--- a/tools/skpmaker.cpp
+++ b/tools/skpmaker.cpp
@@ -17,25 +17,20 @@
 
 // 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, int border, SkColor color,
+static void skpmaker(int width, int height, SkColor color,
                      const char *writePath) {
     SkPicture pict;
     SkCanvas* canvas = pict.beginRecording(width, height);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
-    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);
+    canvas->drawRectCoords(0, 0, SkIntToScalar(width), SkIntToScalar(height), paint);
     pict.endRecording();
     SkFILEWStream stream(writePath);
     pict.serialize(&stream);
@@ -73,7 +68,7 @@ int tool_main(int argc, char** argv) {
     }
 
     SkColor color = SkColorSetRGB(FLAGS_red, FLAGS_green, FLAGS_blue);
-    skpmaker(FLAGS_width, FLAGS_height, FLAGS_border, color, FLAGS_writePath[0]);
+    skpmaker(FLAGS_width, FLAGS_height, color, FLAGS_writePath[0]);
     return 0;
 }
 

diff --git a/tools/tests/render_pictures_test.py b/tools/tests/render_pictures_test.py
index 33c1e6a..89ea228 100755 (executable)
--- a/tools/tests/render_pictures_test.py
+++ b/tools/tests/render_pictures_test.py
@@ -40,11 +40,10 @@ class RenderPicturesTest(base_unittest.TestCase):
     expected_summary_dict = {
         "actual-results" : {
             "no-comparison" : {
-                # Manually verified: 640x400 red image with black border
-                "input.png" : [ "bitmap-64bitMD5", 11092453015575919668 ]
+                "input.png" : [ "bitmap-64bitMD5", 12793741875005523433 ]
+                }
             }
         }
-    }
     self._assert_json_contents(output_json_path, expected_summary_dict)
 
   def test_tiled_no_comparison(self):