Try out scalar picture sizes

tools/filtermain.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebugCanvas.h"
 #include "SkDevice.h"
 #include "SkForceLinking.h"
@@ skipping 659 matching lines @@
 
     if (NULL == inPicture.get()) {
         SkDebugf("Could not read file %s\n", inFile.c_str());
         return -1;
     }
 
     int localCount[SK_ARRAY_COUNT(gOptTable)];
 
     memset(localCount, 0, sizeof(localCount));
 
-    SkDebugCanvas debugCanvas(inPicture->width(), inPicture->height());
-    debugCanvas.setBounds(inPicture->width(), inPicture->height());
+    SkDebugCanvas debugCanvas(SkScalarCeilToInt(inPicture->cullRect().width()), 
+                              SkScalarCeilToInt(inPicture->cullRect().height()));
     inPicture->draw(&debugCanvas);
 
     // delete the initial save and restore since replaying the commands will
     // re-add them
     if (debugCanvas.getSize() > 1) {
         debugCanvas.deleteDrawCommandAt(0);
         debugCanvas.deleteDrawCommandAt(debugCanvas.getSize()-1);
     }
 
     bool changed = true;
@@ skipping 18 matching lines @@
                     changed = true;
                 }
             }
         }
     }
 
     int numAfter = debugCanvas.getSize();
 
     if (!outFile.isEmpty()) {
         SkPictureRecorder recorder;
-        SkCanvas* canvas = recorder.beginRecording(inPicture->width(), inPicture->height(), NULL, 0);
+        SkCanvas* canvas = recorder.beginRecording(inPicture->cullRect().width(), 
+                                                   inPicture->cullRect().height(), 
+                                                   NULL, 0);
         debugCanvas.draw(canvas);
         SkAutoTUnref<SkPicture> outPicture(recorder.endRecording());
 
         SkFILEWStream outStream(outFile.c_str());
 
         outPicture->serialize(&outStream);
     }
 
     bool someOptFired = false;
     for (size_t opt = 0; opt < SK_ARRAY_COUNT(gOptTable); ++opt) {
@@ skipping 106 matching lines @@
 
     SkGraphics::Term();
     return 0;
 }
 
 #if !defined SK_BUILD_FOR_IOS
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif