Skip to content

Commit

Permalink
Remove lingered condition for isolation key w.r.t enable-unsafe-webgpu.
Browse files Browse the repository at this point in the history
Note:
The requirement for the flag was removed in
https://chromium-review.googlesource.com/c/chromium/src/+/4038415 but
this condition was unintentionally left in. This causes device
initialization to hang when the flag is not specified. This change will
need to be back-rolled into M110 branch.

(cherry picked from commit 73800c0)

Bug: chromium:1410915
Change-Id: Ie0e30bccb19d710878aa80e18833dc5a400b020e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4191632
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Loko Kung <lokokung@google.com>
Cr-Original-Commit-Position: refs/heads/main@{#1098201}
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4205508
Cr-Commit-Position: refs/branch-heads/5481@{#812}
Cr-Branched-From: 130f3e4-refs/heads/main@{#1084008}
  • Loading branch information
lokokung authored and Chromium LUCI CQ committed Jan 31, 2023
1 parent 8a0ff9b commit 03f7443
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions gpu/command_buffer/service/webgpu_decoder_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2034,13 +2034,11 @@ error::Error WebGPUDecoderImpl::HandleSetWebGPUExecutionContextToken(
NOTREACHED();
return error::kInvalidArguments;
}
if (enable_unsafe_webgpu_) {
isolation_key_provider_->GetIsolationKey(
execution_context_token,
base::BindPostTask(base::SingleThreadTaskRunner::GetCurrentDefault(),
base::BindOnce(&WebGPUDecoderImpl::OnGetIsolationKey,
weak_ptr_factory_.GetWeakPtr())));
}
isolation_key_provider_->GetIsolationKey(
execution_context_token,
base::BindPostTask(base::SingleThreadTaskRunner::GetCurrentDefault(),
base::BindOnce(&WebGPUDecoderImpl::OnGetIsolationKey,
weak_ptr_factory_.GetWeakPtr())));
return error::kNoError;
}

Expand Down

0 comments on commit 03f7443

Please sign in to comment.