fix pictures to not skip-over clip ops that might expand the clip

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

1 files changed, 5 insertions, 4 deletions

diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index 1c646988fa..44a8935d0f 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -70,8 +70,6 @@ public:
         }
     }
 
-    virtual bool validForPicture() const { return false; }
-
 protected:
 
     static const int kRows = 5;
@@ -79,11 +77,14 @@ protected:
     static const int kPadX = 20;
     static const int kPadY = 20;
 
-    SkString onShortName() {
+    virtual SkString onShortName() {
         return SkString("complexclip2");
     }
 
-    SkISize onISize() { return make_isize(fTotalWidth, fTotalHeight); }
+    virtual SkISize onISize() {
+        return make_isize(SkScalarRoundToInt(fTotalWidth),
+                          SkScalarRoundToInt(fTotalHeight));
+    }
 
     void drawBG(SkCanvas* canvas) {
         canvas->drawColor(SkColorSetRGB(0xDD,0xA0,0xDD));