aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/gpu.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-11-28 11:05:19 -0500
committerGitHub <noreply@github.com>2019-11-28 11:05:19 -0500
commitb0012a62b2ac97bad2a12c048de830362e0ea4bc (patch)
tree0961191ed62b3bd819a58ef5f74e9173a0c9d550 /components/script/dom/gpu.rs
parent5f1681ad25921e7bb779a9223445167124e44e14 (diff)
parentb26598d47094a24db3f8041c8e070229106e419d (diff)
downloadservo-b0012a62b2ac97bad2a12c048de830362e0ea4bc.tar.gz
servo-b0012a62b2ac97bad2a12c048de830362e0ea4bc.zip
Auto merge of #24883 - szeged:id_management, r=jdm
Add WebGPU identity management <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes addresses a part of #24706 <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> cc @jdm, @kvark, @zakorgy <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/script/dom/gpu.rs')
-rw-r--r--components/script/dom/gpu.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/components/script/dom/gpu.rs b/components/script/dom/gpu.rs
index cbde108bc01..4e47620052e 100644
--- a/components/script/dom/gpu.rs
+++ b/components/script/dom/gpu.rs
@@ -5,6 +5,7 @@
use crate::compartments::InCompartment;
use crate::dom::bindings::codegen::Bindings::GPUBinding::GPURequestAdapterOptions;
use crate::dom::bindings::codegen::Bindings::GPUBinding::{self, GPUMethods, GPUPowerPreference};
+use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowBinding::WindowMethods;
use crate::dom::bindings::error::Error;
use crate::dom::bindings::refcounted::{Trusted, TrustedPromise};
use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, Reflector};
@@ -120,6 +121,7 @@ impl GPUMethods for GPU {
Some(GPUPowerPreference::High_performance) => wgpu::PowerPreference::HighPerformance,
None => wgpu::PowerPreference::Default,
};
+ let id = self.global().as_window().Navigator().create_adapter_id();
match self.wgpu_channel() {
Some(channel) => {
@@ -128,6 +130,7 @@ impl GPUMethods for GPU {
.send(WebGPURequest::RequestAdapter(
sender,
wgpu::RequestAdapterOptions { power_preference },
+ id,
))
.unwrap();
},