Fix cull nesting assertion.

include/core/SkCanvas.h

Index: include/core/SkCanvas.h
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 71ce85791f05beb8f9a9a1b595166877c5e18cb6..aa920b0faa777a6b05b5513f17b03ef837d5409e 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1071,20 +1071,13 @@ public:
      *  is not enforced, but the information might be used to quick-reject command blocks,
      *  so an incorrect bounding box may result in incomplete rendering.
      */
-    void pushCull(const SkRect& cullRect) {
-        ++fCullCount;
-        this->onPushCull(cullRect);
-    }
+    void pushCull(const SkRect& cullRect);
 
     /**
      *  Terminates the current culling block, and restores the previous one (if any).
      */
-    void popCull() {
-        if (fCullCount > 0) {
-            --fCullCount;
-            this->onPopCull();
-        }
-    }
+    void popCull();
+
     //////////////////////////////////////////////////////////////////////////
 
     /** Get the current bounder object.
@@ -1402,6 +1395,8 @@ private:
     };
 
 #ifdef SK_DEBUG

[robertphillips, 2014/03/20 12:23:56]

// The cull stack cull rects are in device-space 

[f(malita), 2014/03/20 13:30:58]

Done.

+    SkTDArray<SkIRect> fCullStack;
+    void validateCull(const SkRect&);
     void validateClip() const;
 #else
     void validateClip() const {}