switch to canvas prebuilt (#3757)

* swithced to canvas prebuilt

* try 2

* remove toolchanin needed to setup canvas

.travis.yml

@@ -3,15 +3,4 @@ node_js:
   - "7"
   - "6"
   - "4"
-env:
-  - CXX=g++-4.9
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.9
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq libgif-dev libpng-dev libjpeg8-dev libpango1.0-dev libcairo2-dev
 script: 'npm run build && npm run test && npm run lint && npm run lint_tests'

HEADER.js

@@ -61,7 +61,7 @@ fabric.DPI = 96;
 fabric.reNum = '(?:[-+]?(?:\\d+|\\d*\\.\\d+)(?:e[-+]?\\d+)?)';
 fabric.fontPaths = { };
 fabric.iMatrix = [1, 0, 0, 1, 0, 0];
-
+fabric.canvasModule = 'canvas-prebuilt';
 /**
  * Cache Object for widths of chars in text rendering.
  */

package.json

@@ -46,7 +46,7 @@
     "all": "npm run build && npm run test && npm run lint && npm run lint_tests && npm run export_dist_to_site && npm run export_tests_to_site"
   },
   "optionalDependencies": {
-    "canvas": "1.6.x",
+    "canvas-prebuilt": "1.6.x",
     "jsdom": "9.x.x",
     "xmldom": "0.1.x"
   },

src/node.js

@@ -9,8 +9,8 @@
       HTTP = require('http'),
       HTTPS = require('https'),
 
-      Canvas = require('canvas'),
-      Image = require('canvas').Image;
+      Canvas = require(fabric.canvasModule),
+      Image = require(fabric.canvasModule).Image;
 
   /** @private */
   function request(url, encoding, callback) {

test/unit/canvas.js

@@ -64,7 +64,7 @@
                   '"visible":true,"clipTo":null,"backgroundColor":"","fillRule":"nonzero","globalCompositeOperation":"source-over","transformMatrix":null,"skewX":0,"skewY":0,"rx":0,"ry":0}],"background":"#ff5555","overlay":"rgba(0,0,0,0.2)"}';
 
   function _createImageElement() {
-    return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img');
+    return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img');
   }
 
   function getAbsolutePath(path) {

test/unit/canvas_static.js

@@ -109,7 +109,7 @@
   };
 
   function _createImageElement() {
-    return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img');
+    return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img');
   }
 
   function _createImageObject(width, height, callback) {

test/unit/group.js

@@ -6,7 +6,7 @@
   var canvas = this.canvas = fabric.isLikelyNode ? fabric.createCanvasForNode(600, 600, {enableRetinaScaling: false}) : new fabric.Canvas(el, {enableRetinaScaling: false});
 
   // function _createImageElement() {
-  //   return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img');
+  //   return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img');
   // }
 
   function makeGroupWith2Objects() {

test/unit/image.js

@@ -54,7 +54,7 @@
   };
 
   function _createImageElement() {
-    return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img');
+    return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img');
   }
 
   function _createImageObject(width, height, callback, options) {
@@ -62,7 +62,7 @@
     setSrc(elImage, IMG_SRC, function() {
       if (width != elImage.width || height != elImage.height) {
         if (fabric.isLikelyNode) {
-          var Canvas = require('canvas');
+          var Canvas = require(fabric.canvasModule);
           var canvas = new Canvas(width, height);
           canvas.getContext('2d').drawImage(elImage, 0, 0, width, height);
           elImage._src = canvas.toDataURL();

test/unit/image_filters.js

@@ -49,7 +49,7 @@
   // };
 
   function _createImageElement() {
-    return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img');
+    return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img');
   }
 
   function _createImageObject(width, height, callback) {

test/unit/object.js

@@ -19,7 +19,7 @@
       IMG_HEIGHT  = 110;
 
   function _createImageElement() {
-    return fabric.isLikelyNode ? new (require('canvas').Image)() : fabric.document.createElement('img');
+    return fabric.isLikelyNode ? new (require(fabric.canvasModule).Image)() : fabric.document.createElement('img');
   }
 
   function createImageObject(callback) {

test/unit/pattern.js

@@ -3,7 +3,7 @@
 
   function createImageElement() {
     return fabric.isLikelyNode
-            ? new (require('canvas').Image)()
+            ? new (require(fabric.canvasModule).Image)()
             : fabric.document.createElement('img');
   }
   function setSrc(img, src, callback) {

test/unit/util.js

@@ -6,7 +6,7 @@
 
   function _createImageElement() {
     return fabric.isLikelyNode
-            ? new (require('canvas').Image)()
+            ? new (require(fabric.canvasModule).Image)()
             : fabric.document.createElement('img');
   }