Fix cull nesting assertion.

include/core/SkCanvas.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkCanvas_DEFINED
 #define SkCanvas_DEFINED
 
@@ skipping 1053 matching lines @@
     virtual void endCommentGroup() {
         // do nothing. Subclasses may do something
     }
 
     /**
      *  With this call the client asserts that subsequent draw operations (up to the
      *  matching popCull()) are fully contained within the given bounding box. The assertion
      *  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.
         The bounder's reference count is unchaged.
         @return the canva's bounder (or NULL).
     */
     SkBounder*  getBounder() const { return fBounder; }
 
     /** Set a new bounder (or NULL).
         Pass NULL to clear any previous bounder.
@@ skipping 296 matching lines @@
     public:
         explicit AutoValidateClip(SkCanvas* canvas) : fCanvas(canvas) {
             fCanvas->validateClip();
         }
         ~AutoValidateClip() { fCanvas->validateClip(); }
 
     private:
         const SkCanvas* fCanvas;
     };
 
 #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 {}
 #endif
 
     typedef SkRefCnt INHERITED;
 };
 
 /** Stack helper class to automatically call restoreToCount() on the canvas
     when this object goes out of scope. Use this to guarantee that the canvas
@@ skipping 91 matching lines @@
     bool asROBitmap(SkBitmap*) const;
 
 private:
     SkBitmap    fBitmap;    // used if peekPixels() fails
     const void* fAddr;      // NULL on failure
     SkImageInfo fInfo;
     size_t      fRowBytes;
 };
 
 #endif