Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-10 14:54:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better resource cleaning on canvas dispose (#5142)

Browse source 
* test-leak

* better than nothing

* avoid breaking tests

* avoid breaking tests
This commit is contained in:
Andrea Bogazzi 2018-08-05 17:50:51 +02:00 committed by GitHub
parent 74fa4f1f30
commit c541a273ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/canvas.class.js
View file

@ -1577,10 +1577,12 @@
this.removeListeners();
wrapper.removeChild(this.upperCanvasEl);
wrapper.removeChild(this.lowerCanvasEl);
this.upperCanvasEl = null;
this.cacheCanvasEl = null;
this.contextCache = null;
this.contextTop = null;
['upperCanvasEl', 'cacheCanvasEl'].forEach((function(element) {
fabric.util.cleanUpJsdomNode(this[element]);
this[element] = undefined;
}).bind(this));
if (wrapper.parentNode) {
wrapper.parentNode.replaceChild(this.lowerCanvasEl, this.wrapperEl);
}

8
src/shapes/image.class.js
View file

@ -184,9 +184,11 @@
backend.evictCachesForKey(this.cacheKey);
backend.evictCachesForKey(this.cacheKey + '_filtered');
}
this._originalElement = undefined;
this._element = undefined;
this._filteredEl = undefined;
this._cacheContext = undefined;
['_originalElement', '_element', '_filteredEl', '_cacheCanvas'].forEach((function(element) {
fabric.util.cleanUpJsdomNode(this[element]);
this[element] = undefined;
}).bind(this));
},
/**

9
src/static_canvas.class.js
View file

@ -1673,11 +1673,18 @@
object.dispose && object.dispose();
});
this._objects = [];
if (this.backgroundImage && this.backgroundImage.dispose) {
this.backgroundImage.dispose();
}
this.backgroundImage = null;
if (this.overlayImage && this.overlayImage.dispose) {
this.overlayImage.dispose();
}
this.overlayImage = null;
this._iTextInstances = null;
this.lowerCanvasEl = null;
this.contextContainer = null;
fabric.util.cleanUpJsdomNode(this.lowerCanvasEl);
this.lowerCanvasEl = undefined;
return this;
},

16
src/util/dom_misc.js
View file

@ -292,6 +292,21 @@
return impl._canvas || impl._image;
};
function cleanUpJsdomNode(element) {
if (!fabric.isLikelyNode) {
return;
}
var impl = fabric.jsdomImplForWrapper(element);
if (impl) {
impl._image = null;
impl._canvas = null;
// unsure if necessary
impl._currentSrc = null;
impl._attributes = null;
impl._classList = null;
}
}
fabric.util.getById = getById;
fabric.util.toArray = toArray;
fabric.util.makeElement = makeElement;
@ -301,5 +316,6 @@
fabric.util.getElementOffset = getElementOffset;
fabric.util.getElementStyle = getElementStyle;
fabric.util.getNodeCanvas = getNodeCanvas;
fabric.util.cleanUpJsdomNode = cleanUpJsdomNode;
})();

6
test/visual/resize_filter.js
View file

@ -46,9 +46,11 @@
}
var img = fabric.document.createElement('img');
img.onload = function() {
img.onload = null;
callback(img);
};
img.onerror = function(err) {
img.onerror = null;
console.log('Image loading errored', err);
};
img.src = filename;
@ -79,8 +81,8 @@
image.scaleToWidth(canvas.width / zoom);
canvas.add(image);
canvas.renderAll();
image.dispose();
callback(canvas.lowerCanvasEl);
image.dispose();
});
}
@ -103,8 +105,8 @@
image.scaleToWidth(canvas.width);
canvas.add(image);
canvas.renderAll();
image.dispose();
callback(canvas.lowerCanvasEl);
image.dispose();
});
}