commit b0cdbba6bc56c14d1e88a08f2c6207c25aeb57ab
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 15 15:44:35 2013 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Oct 15 15:44:35 2013 +0000
tree e58a0cf1eadf44c93dd65222c5b9a68c55040582
parent 7def63b32de4e05c0fa8320539e9ba96148b706a

account for inverse-paths when we prealloc storage in the rgn-builder

test inversepath->rgn

BUG=
R=caryclark@google.com

Review URL: https://codereview.chromium.org/27222005

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

core/SkRegion_path.cpp

diff --git a/core/SkRegion_path.cpp b/core/SkRegion_path.cpp
index 0a5a401..65fe25f 100644
--- a/core/SkRegion_path.cpp
+++ b/core/SkRegion_path.cpp
@@ -18,7 +18,7 @@
     virtual ~SkRgnBuilder();
 
     // returns true if it could allocate the working storage needed
-    bool init(int maxHeight, int maxTransitions);
+    bool init(int maxHeight, int maxTransitions, bool pathIsInverse);
 
     void done() {
         if (fCurrScanline != NULL) {
@@ -102,15 +102,29 @@
     sk_free(fStorage);
 }
 
-bool SkRgnBuilder::init(int maxHeight, int maxTransitions) {
+bool SkRgnBuilder::init(int maxHeight, int maxTransitions, bool pathIsInverse) {
     if ((maxHeight | maxTransitions) < 0) {
         return false;
     }
 
     Sk64 count, size;
 
+    if (pathIsInverse) {
+        // allow for additional X transitions to "invert" each scanline
+        // [ L' ... normal transitions ... R' ]
+        //
+        maxTransitions += 2;
+    }
+
     // compute the count with +1 and +3 slop for the working buffer
     count.setMul(maxHeight + 1, 3 + maxTransitions);
+
+    if (pathIsInverse) {
+        // allow for two "empty" rows for the top and bottom
+        //      [ Y, 1, L, R, S] == 5 (*2 for top and bottom)
+        count.add(10);
+    }
+
     if (!count.is32() || count.isNeg()) {
         return false;
     }
@@ -120,7 +134,7 @@
     if (!size.is32() || size.isNeg()) {
         return false;
     }
-
+    
     fStorage = (SkRegion::RunType*)sk_malloc_flags(size.get32(), 0);
     if (NULL == fStorage) {
         return false;
@@ -312,7 +326,9 @@
 
     SkRgnBuilder builder;
 
-    if (!builder.init(bot - top, SkMax32(pathTransitions, clipTransitions))) {
+    if (!builder.init(bot - top,
+                      SkMax32(pathTransitions, clipTransitions),
+                      path.isInverseFillType())) {
         // can't allocate working space, so return false
         return this->setEmpty();
     }