commit 45482d1d2b97de185df137a1db40cbe5a62313a5
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 29 19:02:39 2011 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Aug 29 19:02:39 2011 +0000
tree a6a90cc7559e993c4af5a51cc826e933859549fa
parent 574f29dfa7944879e3266ccdf47dc7f178f21104

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

gm/complexclip2.cpp

diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index 1c64698..44a8935 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -70,8 +70,6 @@
         }
     }
 
-    virtual bool validForPicture() const { return false; }
-
 protected:
 
     static const int kRows = 5;
@@ -79,11 +77,14 @@
     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));