Added an option to specify the tiling size to render_pictures.

With this change I should be able to start merging the rendering implementations of bench_pictures and render_pictures.

Review URL: https://codereview.appspot.com/6427061

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

3 files changed, 98 insertions, 3 deletions

diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp
index 71f936ea37..5f3496c60f 100644
--- a/tools/PictureRenderer.cpp
+++ b/tools/PictureRenderer.cpp
@@ -33,6 +33,14 @@ TiledPictureRenderer::TiledPictureRenderer()
 
 void TiledPictureRenderer::init(const SkPicture& pict) {
     deleteTiles();
+
+    if (fTileWidthPercentage > 0) {
+        fTileWidth = sk_float_ceil2int(fTileWidthPercentage * pict.width() / 100);
+    }
+    if (fTileHeightPercentage > 0) {
+        fTileHeight = sk_float_ceil2int(fTileHeightPercentage * pict.height() / 100);
+    }
+
     setupTiles(pict);
 }
 
diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index 5fa53c1a7c..ebf1891bed 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -38,6 +38,38 @@ public:
     virtual void init(const SkPicture& pict);
     virtual void render(SkPicture* pict, SkCanvas* canvas);
 
+    void setTileWidth(int width) {
+        fTileWidth = width;
+    }
+
+    int getTileWidth() const {
+        return fTileWidth;
+    }
+
+    void setTileHeight(int height) {
+        fTileHeight = height;
+    }
+
+    int getTileHeight() const {
+        return fTileHeight;
+    }
+
+    void setTileWidthPercentage(double percentage) {
+        fTileWidthPercentage = percentage;
+    }
+
+    double getTileWidthPercentage() {
+        return fTileWidthPercentage;
+    }
+
+    void setTileHeightPercentage(double percentage) {
+        fTileHeightPercentage = percentage;
+    }
+
+    double getTileHeightPercentage() {
+        return fTileHeightPercentage;
+    }
+
     ~TiledPictureRenderer();
 
 private:
@@ -48,6 +80,8 @@ private:
 
     int fTileWidth;
     int fTileHeight;
+    double fTileWidthPercentage;
+    double fTileHeightPercentage;
 
     SkTDArray<TileInfo> fTiles;
 
diff --git a/tools/render_pictures_main.cpp b/tools/render_pictures_main.cpp
index 8c227563d2..6b76c50066 100644
--- a/tools/render_pictures_main.cpp
+++ b/tools/render_pictures_main.cpp
@@ -23,7 +23,7 @@ static void usage(const char* argv0) {
     SkDebugf("\n"
 "Usage: \n"
 "     %s <input>... <outputDir> \n"
-"     [--pipe | --tile]"
+"     [--pipe | --tile width[%] height[%]]"
 , argv0);
     SkDebugf("\n\n");
     SkDebugf(
@@ -34,7 +34,7 @@ static void usage(const char* argv0) {
     SkDebugf(
 "     --pipe : Render using a SkGPipe\n");
     SkDebugf(
-"     --tile : Render using tiles.\n");
+"     --tile width[%] height[%]: Render using tiles with the given dimensions.\n");
 }
 
 static void make_output_filepath(SkString* path, const SkString& dir,
@@ -114,6 +114,11 @@ static void process_input(const SkString& input, const SkString& outputDir,
     }
 }
 
+static bool is_percentage(char* const string) {
+    SkString skString(string);
+    return skString.endsWith("%");
+}
+
 static void parse_commandline(int argc, char* const argv[], SkTArray<SkString>* inputs,
                               sk_tools::PictureRenderer*& renderer){
     const char* argv0 = argv[0];
@@ -123,7 +128,55 @@ static void parse_commandline(int argc, char* const argv[], SkTArray<SkString>*
         if (0 == strcmp(*argv, "--pipe")) {
             renderer = SkNEW(sk_tools::PipePictureRenderer);
         } else if (0 == strcmp(*argv, "--tile")) {
-            renderer = SkNEW(sk_tools::TiledPictureRenderer);
+            sk_tools::TiledPictureRenderer* tileRenderer = SkNEW(sk_tools::TiledPictureRenderer);
+            ++argv;
+            if (argv < stop) {
+                if (is_percentage(*argv)) {
+                    tileRenderer->setTileWidthPercentage(atof(*argv));
+                    if (!(tileRenderer->getTileWidthPercentage() > 0)) {
+                        SkDELETE(tileRenderer);
+                        SkDebugf("--tile must be given a width percentage > 0\n");
+                        exit(-1);
+                    }
+                } else {
+                    tileRenderer->setTileWidth(atoi(*argv));
+                    if (!(tileRenderer->getTileWidth() > 0)) {
+                        SkDELETE(tileRenderer);
+                        SkDebugf("--tile must be given a width > 0\n");
+                        exit(-1);
+                    }
+                }
+            } else {
+                SkDELETE(tileRenderer);
+                SkDebugf("Missing width for --tile\n");
+                usage(argv0);
+                exit(-1);
+            }
+            ++argv;
+            if (argv < stop) {
+                if (is_percentage(*argv)) {
+                    tileRenderer->setTileHeightPercentage(atof(*argv));
+                    if (!(tileRenderer->getTileHeightPercentage() > 0)) {
+                        SkDELETE(tileRenderer);
+                        SkDebugf(
+                            "--tile must be given a height percentage > 0\n");
+                        exit(-1);
+                    }
+                } else {
+                    tileRenderer->setTileHeight(atoi(*argv));
+                    if (!(tileRenderer->getTileHeight() > 0)) {
+                        SkDELETE(tileRenderer);
+                        SkDebugf("--tile must be given a height > 0\n");
+                        exit(-1);
+                    }
+                }
+            } else {
+                SkDELETE(tileRenderer);
+                SkDebugf("Missing height for --tile\n");
+                usage(argv0);
+                exit(-1);
+            }
+            renderer = tileRenderer;
         } else if ((0 == strcmp(*argv, "-h")) || (0 == strcmp(*argv, "--help"))) {
             SkDELETE(renderer);
             usage(argv0);