Commit 6a7063ae authored by Fernando Serboncini's avatar Fernando Serboncini Committed by Commit Bot

Clean up CanvasResourceDispatcher on finalizer

We may have pending mojo messages after GC, so we want to drop the
dispatcher as soon as possible.

Bug: 929757,913964
Change-Id: I5789bcbb55aada4a74c67a28758f07686f8911c0
Reviewed-on: https://chromium-review.googlesource.com/c/1489175Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Ken Rockot <rockot@google.com>
Commit-Queue: Fernando Serboncini <fserb@chromium.org>
Auto-Submit: Fernando Serboncini <fserb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635833}
parent 4fa7ade8
...@@ -158,6 +158,9 @@ void HTMLCanvasElement::Dispose() { ...@@ -158,6 +158,9 @@ void HTMLCanvasElement::Dispose() {
if (PlaceholderFrame()) if (PlaceholderFrame())
ReleasePlaceholderFrame(); ReleasePlaceholderFrame();
// We need to drop frame dispatcher, to prevent mojo calls from completing.
frame_dispatcher_ = nullptr;
if (context_) { if (context_) {
context_->DetachHost(); context_->DetachHost();
context_ = nullptr; context_ = nullptr;
......
...@@ -67,6 +67,9 @@ void OffscreenCanvas::Commit(scoped_refptr<CanvasResource> canvas_resource, ...@@ -67,6 +67,9 @@ void OffscreenCanvas::Commit(scoped_refptr<CanvasResource> canvas_resource,
} }
void OffscreenCanvas::Dispose() { void OffscreenCanvas::Dispose() {
// We need to drop frame dispatcher, to prevent mojo calls from completing.
frame_dispatcher_ = nullptr;
if (context_) { if (context_) {
context_->DetachHost(); context_->DetachHost();
context_ = nullptr; context_ = nullptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment