Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better resource cleaning on canvas dispose #5142

Merged
merged 4 commits into from
Aug 5, 2018
Merged

Better resource cleaning on canvas dispose #5142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0a9603
test-leak
asturur Aug 5, 2018
a6a8fc0
better than nothing
asturur Aug 5, 2018
fe7e4a7
avoid breaking tests
asturur Aug 5, 2018
c215477
avoid breaking tests
asturur Aug 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
better than nothing
  • Loading branch information
@asturur
asturur committed Aug 5, 2018
commit a6a8fc009f8a2f61473033924fd576b53bba6a72
4 changes: 2 additions & 2 deletions src/canvas.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,10 +1579,10 @@
wrapper.removeChild(this.lowerCanvasEl);
this.contextCache = null;
this.contextTop = null;
['upperCanvasEl', 'cacheCanvasEl'].forEach(function(element) {
['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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/shapes/image.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,10 @@
backend.evictCachesForKey(this.cacheKey + '_filtered');
}
this._cacheContext = undefined;
['_originalElement', '_element', '_filteredEl', '_cacheCanvas'].forEach(function(element) {
['_originalElement', '_element', '_filteredEl', '_cacheCanvas'].forEach((function(element) {
fabric.util.cleanUpJsdomNode(this[element]);
this[element] = undefined;
});
}).bind(this));
},

/**
Expand Down
6 changes: 2 additions & 4 deletions src/static_canvas.class.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1683,10 +1683,8 @@
this.overlayImage = null;
this._iTextInstances = null;
this.contextContainer = null;
['lowerCanvasEl'].forEach(function(element) {
fabric.util.cleanUpJsdomNode(this[element]);
this[element] = undefined;
});
fabric.util.cleanUpJsdomNode(this.lowerCanvasEl);
this.lowerCanvasEl = undefined;
return this;
},

Expand Down