fixed cache for first draw (#3870)

* fixed cache for first draw * fixed tests
fabricjs · Apr 23, 2017 · aff86b1 · aff86b1
1 parent 28d90b4
commit aff86b1
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 36 deletions.
diff --git a/src/mixins/stateful.mixin.js b/src/mixins/stateful.mixin.js
@@ -57,6 +57,9 @@
     hasStateChanged: function(propertySet) {
       propertySet = propertySet || originalSet;
       propertySet = '_' + propertySet;
+      if (!Object.keys(this[propertySet]).length) {
+        return true;
+      }
       return !_isEqual(this[propertySet], this, true);
     },
 

diff --git a/src/shapes/object.class.js b/src/shapes/object.class.js
@@ -792,9 +792,9 @@
      * When set to `true`, object's cache will be rerendered next render call.
      * since 1.7.0
      * @type Boolean
-     * @default false
+     * @default true
      */
-    dirty:                false,
+    dirty:                true,
 
     /**
      * When set to `true`, force the object to have its own cache, even if it is inside a group
@@ -839,7 +839,6 @@
       }
       if (this.objectCaching) {
         this._createCacheCanvas();
-        this.setupState({ propertySet: 'cacheProperties' });
       }
     },
 
@@ -848,6 +847,7 @@
      * @private
      */
     _createCacheCanvas: function() {
+      this._cacheProperties = {};
       this._cacheCanvas = fabric.document.createElement('canvas');
       this._cacheContext = this._cacheCanvas.getContext('2d');
       this._updateCacheCanvas();
@@ -1104,17 +1104,6 @@
       // implemented by sub-classes, as needed.
     },
 
-    /**
-     * Sets sourcePath of an object
-     * @param {String} value Value to set sourcePath to
-     * @return {fabric.Object} thisArg
-     * @chainable
-     */
-    setSourcePath: function(value) {
-      this.sourcePath = value;
-      return this;
-    },
-
     /**
      * Retrieves viewportTransform from Object's canvas if possible
      * @method getViewportTransform

diff --git a/src/shapes/path.class.js b/src/shapes/path.class.js
@@ -105,12 +105,8 @@
 
       this._setPositionDimensions(options);
 
-      if (options.sourcePath) {
-        this.setSourcePath(options.sourcePath);
-      }
       if (this.objectCaching) {
         this._createCacheCanvas();
-        this.setupState({ propertySet: 'cacheProperties' });
       }
     },
 

diff --git a/src/shapes/path_group.class.js b/src/shapes/path_group.class.js
@@ -54,12 +54,8 @@
       }
       this.setOptions(options);
       this.setCoords();
-      if (options.sourcePath) {
-        this.setSourcePath(options.sourcePath);
-      }
       if (this.objectCaching) {
         this._createCacheCanvas();
-        this.setupState({ propertySet: 'cacheProperties' });
       }
     },
 
@@ -258,7 +254,6 @@
   fabric.PathGroup.fromObject = function(object, callback) {
     var originalPaths = object.paths;
     delete object.paths;
-    // remove this pattern from 2.0 accepts only object
     if (typeof originalPaths === 'string') {
       fabric.loadSVGFromURL(originalPaths, function (elements) {
         var pathUrl = originalPaths;

diff --git a/src/util/misc.js b/src/util/misc.js
@@ -392,7 +392,7 @@
       object = new fabric.PathGroup(elements, options);
 
       if (typeof path !== 'undefined') {
-        object.setSourcePath(path);
+        object.sourcePath = path;
       }
       return object;
     },

diff --git a/test/unit/object.js b/test/unit/object.js
@@ -149,16 +149,6 @@
     equal(0.123, cObj.getOpacity());
   });
 
-  test('setSourcePath', function() {
-    var cObj = new fabric.Object();
-    var SRC_PATH = 'http://example.com/';
-
-    ok(typeof cObj.setSourcePath == 'function');
-
-    cObj.setSourcePath(SRC_PATH);
-    equal(cObj.get('sourcePath'), SRC_PATH);
-  });
-
   test('stateProperties', function() {
     var cObj = new fabric.Object();
     ok(cObj.stateProperties);
@@ -1260,6 +1250,7 @@
 
   test('isCacheDirty statefullCache disabled', function() {
     var object = new fabric.Object({ scaleX: 3, scaleY: 2});
+    equal(object.dirty, true, 'object is dirty after creation');
     object.cacheProperties = ['propA', 'propB'];
     object.dirty = false;
     object.statefullCache = false;
@@ -1277,6 +1268,8 @@
     object.propA = 'A';
     object.setupState({ propertySet: 'cacheProperties' });
     object._createCacheCanvas();
+    equal(object.isCacheDirty(), true, 'object is dirty if canvas has been just created');
+    object.setupState({ propertySet: 'cacheProperties' });
     equal(object.isCacheDirty(), false, 'object is not dirty');
     object.propA = 'B';
     equal(object.isCacheDirty(), true, 'object is dirty because change in propA is detected by statefullCache');

diff --git a/test/unit/path.js b/test/unit/path.js
@@ -140,7 +140,7 @@
       deepEqual(path.toDatalessObject(), REFERENCE_PATH_OBJECT);
 
       var src = 'http://example.com/';
-      path.setSourcePath(src);
+      path.sourcePath = src;
       deepEqual(path.toDatalessObject(), fabric.util.object.extend(fabric.util.object.clone(REFERENCE_PATH_OBJECT), {
         path: src
       }));

diff --git a/test/unit/path_group.js b/test/unit/path_group.js
@@ -166,7 +166,7 @@
     getPathGroupObject(function(pathGroup) {
       ok(typeof pathGroup.toDatalessObject == 'function');
 
-      pathGroup.setSourcePath('http://example.com/');
+      pathGroup.sourcePath = 'http://example.com/';
       var expectedObject = fabric.util.object.extend(fabric.util.object.clone(REFERENCE_PATH_GROUP_OBJECT), {
         'paths': 'http://example.com/',
         'sourcePath': 'http://example.com/'