Commit 13e0a33c authored by Hiroshige Hayashizaki's avatar Hiroshige Hayashizaki Committed by Commit Bot

Cancel SRIVerifier when the corresponding context is destroyed

Otherwise, DidGetReadable() is called with null ExecutionContext.

Bug: 758883
Change-Id: I904d0c946a1be928c1fe2bebb37efec384a7bd59
Reviewed-on: https://chromium-review.googlesource.com/655807
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: default avatarYutaka Hirano <yhirano@chromium.org>
Reviewed-by: default avatarKouhei Ueno <kouhei@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501166}
parent de503d75
...@@ -195,6 +195,11 @@ class FetchManager::Loader final ...@@ -195,6 +195,11 @@ class FetchManager::Loader final
reader_ = handle_->ObtainReader(this); reader_ = handle_->ObtainReader(this);
} }
void Cancel() {
reader_ = nullptr;
handle_ = nullptr;
}
void DidGetReadable() override { void DidGetReadable() override {
DCHECK(reader_); DCHECK(reader_);
DCHECK(loader_); DCHECK(loader_);
...@@ -648,6 +653,8 @@ void FetchManager::Loader::Dispose() { ...@@ -648,6 +653,8 @@ void FetchManager::Loader::Dispose() {
loader_->Cancel(); loader_->Cancel();
loader_ = nullptr; loader_ = nullptr;
} }
if (integrity_verifier_)
integrity_verifier_->Cancel();
execution_context_ = nullptr; execution_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