Merge pull request #1045 from tete1030/fix-domtoimage-uri

Fix dom-to-image: illegal symbols in data-uri, zero height svg

src/js/dom-to-image.js

@@ -1,6 +1,7 @@
 // dom-to-image-2.6.0
-// patched to add toCanvas public function (line 111)
-// patched to fix uncaught in promise (line 741)
+// patched to add toCanvas public function (line 112)
+// patched to fix uncaught in promise (line 742)
+// patched to fix illegal symbols in data-uri (line 349, 358)
 (function (global) {
     'use strict';
 
@@ -345,7 +346,7 @@
                 node.setAttribute('xmlns', 'http://www.w3.org/1999/xhtml');
                 return new XMLSerializer().serializeToString(node);
             })
-            .then(util.escapeXhtml)
+            // .then(util.escapeXhtml)
             .then(function (xhtml) {
                 return '<foreignObject x="0" y="0" width="100%" height="100%">' + xhtml + '</foreignObject>';
             })
@@ -354,7 +355,7 @@
                     foreignObject + '</svg>';
             })
             .then(function (svg) {
-                return 'data:image/svg+xml;charset=utf-8,' + svg;
+                return 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svg);
             });
     }
 

src/js/gsTabSuspendManager.js

@@ -560,7 +560,7 @@ var gsTabSuspendManager = (function() {
     if (useAlternateScreenCaptureLib) {
       // console.log('Generating via dom-to-image..');
       generateCanvas = () => {
-        return domtoimage.toCanvas(document.body, {}).then(canvas => {
+        return domtoimage.toCanvas(document.body, {width: width, height: height}).then(canvas => {
           const croppedCanvas = document.createElement('canvas');
           const context = croppedCanvas.getContext('2d');
           croppedCanvas.width = width;