Skip to content

GitLab

T
tangled
Commit afb472c0 authored by Marijn Kruisselbrink's avatar Marijn Kruisselbrink Committed by Commit Bot
Browse files
Options

Try to fix crash when terminating a worker while it is XHR-ing to a blob. 

Also add test to try to replicate the crash, although the best it seems
to do is flakily DCHECKing. At least this CL seems to fix the DCHECK.

Bug: 829859
Change-Id: I44f416d7c3edf68e2faf15c2eba7d582db947a0a
Reviewed-on: https://chromium-review.googlesource.com/1014400
Commit-Queue: Marijn Kruisselbrink <mek@chromium.org>
Reviewed-by: default avatarMichael Lippautz <mlippautz@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551549}
parent f1291fb3
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 1 deletion
third_party/WebKit/LayoutTests/external/wpt/xhr/close-worker-with-xhr-in-progress.html 0 → 100644
View file @ afb472c0
<!doctype html>
<html>
<head>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
async_test(t => {
function workerCode(origin) {
const xhr = new XMLHttpRequest();
xhr.open('GET', origin + '/xhr/resources/image.gif?pipe=trickle(100:d2)', true);
xhr.responseType = 'blob';
xhr.send();
postMessage('sent');
}
const workerBlob = new Blob([workerCode.toString() + ";workerCode('" + location.origin + "');"], {type:"application/javascript"});
const w = new Worker(URL.createObjectURL(workerBlob));
w.onmessage = t.step_func(e => {
assert_equals(e.data, 'sent');
t.step_timeout(t.step_func(() => {
w.terminate();
t.step_timeout(t.step_func_done(() => {}), 500);
}, 100));
});
}, 'Terminating a worker with a XHR in progress doesn\'t crash');
</script>
third_party/blink/renderer/platform/loader/fetch/resource_loader.cc
View file @ afb472c0
...@@ -628,12 +628,15 @@ void ResourceLoader::DidStartLoadingResponseBody( ...@@ -628,12 +628,15 @@ void ResourceLoader::DidStartLoadingResponseBody(
mojom::blink::ProgressClientAssociatedPtrInfo progress_client_ptr; mojom::blink::ProgressClientAssociatedPtrInfo progress_client_ptr;
progress_binding_.Bind(MakeRequest(&progress_client_ptr)); progress_binding_.Bind(MakeRequest(&progress_client_ptr));
// Callback is bound to a WeakPersistent, as ResourceLoader is kept alive by
// ResourceFetcher as long as we still care about the result of the load.
mojom::blink::BlobRegistry* blob_registry = BlobDataHandle::GetBlobRegistry(); mojom::blink::BlobRegistry* blob_registry = BlobDataHandle::GetBlobRegistry();
blob_registry->RegisterFromStream( blob_registry->RegisterFromStream(
mime_type.IsNull() ? g_empty_string : mime_type.LowerASCII(), "", mime_type.IsNull() ? g_empty_string : mime_type.LowerASCII(), "",
std::max(0ll, response.ExpectedContentLength()), std::move(body), std::max(0ll, response.ExpectedContentLength()), std::move(body),
std::move(progress_client_ptr), std::move(progress_client_ptr),
WTF::Bind(&ResourceLoader::FinishedCreatingBlob, WrapPersistent(this))); WTF::Bind(&ResourceLoader::FinishedCreatingBlob,
WrapWeakPersistent(this)));
} }
void ResourceLoader::DidDownloadData(int length, int encoded_data_length) { void ResourceLoader::DidDownloadData(int length, int encoded_data_length) {
......
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