From b81d7473e3bb6db01faf2b42a790c5b1dccbbd83 Mon Sep 17 00:00:00 2001
From: Andy Edinborough <andy@edinborough.org>
Date: Fri, 28 Dec 2012 16:22:43 -0600
Subject: [PATCH] rewrite parseBackgroundImage to remove RegExp

RegExp couldn't handle parens inside parens:
linear-gradient(rgb(0,0,0),rgb(255,0,0))
---
 src/Core.js             | 92 ++++++++++++++++++++++++++++++++---------
 tests/qunit/unit/css.js | 11 ++++-
 2 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/src/Core.js b/src/Core.js
index 3f269cd..3175879 100644
--- a/src/Core.js
+++ b/src/Core.js
@@ -33,29 +33,81 @@ _html2canvas.Util.backgroundImage = function (src) {
 
 _html2canvas.Util.parseBackgroundImage = function (value) {
     var rxBackgroundImage = /([a-z\-]+)\((("[^"]+)|([^)]+))\)/i,
-        match, results = [], n = 0;
-    if(!value) { return results; }
+        method, definition, prefix, prefix_i, block, results = [], 
+        c, mode = 0, numParen = 0;
 
-    while( n++ < 100 && !!(match = value.match(rxBackgroundImage)) ) {
-        var def = match[2], 
-            method = match[1],
-            prefix = '', i;
-        if(def.substr( 0, 1 ) === '"') {
-            def = def.substr( 1, def.length-2 );
+    var appendResult = function(){
+        if(method) {
+            if(definition.substr( 0, 1 ) === '"') {
+                definition = definition.substr( 1, definition.length - 2 );
+            }
+            if(method.substr( 0, 1 ) === '-' && 
+                    (prefix_i = method.indexOf( '-', 1 ) + 1) > 0) {
+                prefix = method.substr( 0, prefix_i);
+                method = method.substr( prefix_i );
+            }
+            results.push({
+                prefix: prefix,
+                method: method,
+                definition: definition,
+                value: block
+            });
         }
-        if(method.substr( 0, 1 ) === '-' && 
-                (i = method.indexOf( '-', 1 ) + 1) > 0) {
-            prefix = method.substr( 0, i);
-            method = method.substr( i );
+        method = 
+            prefix =
+            definition =
+            block = '';
+    };
+
+    appendResult();
+    for(var i = 0, ii = value.length; i<ii; i++) {
+        c = value[i];
+        switch(c) {
+            case ' ':
+            case '\t':
+            case '\n':
+            case '\r':
+                if(mode == 0){
+                    continue;
+                }
+                
+            case '(':
+                if(mode === 0) {
+                    mode = 1;
+                    block += c;
+                    continue;
+                } else {
+                    numParen++;
+                }
+                break;
+
+            case ')':
+                if(mode === 1) {
+                    if(numParen === 0) {
+                        mode = 0;
+                        block += c;
+                        appendResult();
+                        continue;
+                    } else { 
+                        numParen--; 
+                    }
+                }
+                break;
+
+            case ',':
+                if(mode === 0) {
+                    appendResult();
+                    continue;
+                }
+                break;
         }
-        results.push({
-            prefix: prefix,
-            method: method,
-            definition: def,
-            value: match[0]
-        });  
-        value = value.replace( match[0], '' );
-    }  
+
+        block += c;
+        if(mode === 0) { method += c; }
+        else { definition += c; }
+    }
+    appendResult();
+
     return results;
 };
 
diff --git a/tests/qunit/unit/css.js b/tests/qunit/unit/css.js
index 2ada42b..485ad72 100644
--- a/tests/qunit/unit/css.js
+++ b/tests/qunit/unit/css.js
@@ -174,6 +174,12 @@ $(function() {
             'linear-gradient'
         );
 
+        test_parse_background_image(
+            'linear-gradient(top,rgb(255,0,0),rgb(0,0,0))', 
+            { prefix: '', method: 'linear-gradient', definition: 'top,rgb(255,0,0),rgb(0,0,0)', value: 'linear-gradient(top,rgb(255,0,0),rgb(0,0,0))' }, 
+            'linear-gradient'
+        );
+
         test_parse_background_image(
             '-webkit-linear-gradient(red,black)', 
             { prefix: '-webkit-', method: 'linear-gradient', definition: 'red,black', value: '-webkit-linear-gradient(red,black)' }, 
@@ -181,10 +187,11 @@ $(function() {
         );
 
         test_parse_background_image(
-            'linear-gradient(red,black), url(test), url("test")', [
+            'linear-gradient(red,black), url(test), url("test"),\n none, ', [
             { prefix: '', method: 'linear-gradient', definition: 'red,black', value: 'linear-gradient(red,black)' },
             { prefix: '', method: 'url', definition: 'test', value: 'url(test)' },
-            { prefix: '', method: 'url', definition: 'test', value: 'url("test")' }
+            { prefix: '', method: 'url', definition: 'test', value: 'url("test")' },
+            { prefix: '', method: 'none', definition: '', value: 'none' }
             ],
             'multiple backgrounds'
         );