diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-03-09 22:36:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-09 22:36:33 -0400 |
| commit | 70101786915ffbe0ec8141f125af855613b1a00c (patch) | |
| tree | a61ef367417bb402eb3808a346e6c43614723cc0 | |
| parent | b4d7ec1c99259f936c9e34de157b652707d308de (diff) | |
| parent | aa060dfd5925f2027937580f794b2cfc159ed92a (diff) | |
| download | servo-70101786915ffbe0ec8141f125af855613b1a00c.tar.gz servo-70101786915ffbe0ec8141f125af855613b1a00c.zip | |
Auto merge of #25837 - servo:jdm-patch-40, r=Manishearth
Remove XR canvas dirtying step.
Alan tells me that this is no longer necessary, and it causes layout operations to appear in immersive mode profiles when there should not be any.
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | components/script/dom/xrsession.rs | 12 |
2 files changed, 2 insertions, 14 deletions
diff --git a/Cargo.lock b/Cargo.lock index e1a3dccc218..f8ea31cf907 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6650,7 +6650,7 @@ dependencies = [ [[package]] name = "webxr" version = "0.0.1" -source = "git+https://github.com/servo/webxr#3ac3e83f37ff64c74c847a610a8cefba9b907a9c" +source = "git+https://github.com/servo/webxr#bf3d92b744a3e48d9addb76f0eef45320ac33960" dependencies = [ "bindgen", "crossbeam-channel", @@ -6672,7 +6672,7 @@ dependencies = [ [[package]] name = "webxr-api" version = "0.0.1" -source = "git+https://github.com/servo/webxr#3ac3e83f37ff64c74c847a610a8cefba9b907a9c" +source = "git+https://github.com/servo/webxr#bf3d92b744a3e48d9addb76f0eef45320ac33960" dependencies = [ "euclid", "ipc-channel", diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs index ecb78615897..ab389c1a82b 100644 --- a/components/script/dom/xrsession.rs +++ b/components/script/dom/xrsession.rs @@ -5,7 +5,6 @@ use crate::dom::bindings::callback::ExceptionHandling; use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::NavigatorBinding::NavigatorBinding::NavigatorMethods; -use crate::dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextMethods; use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowBinding::WindowMethods; use crate::dom::bindings::codegen::Bindings::XRReferenceSpaceBinding::XRReferenceSpaceType; use crate::dom::bindings::codegen::Bindings::XRRenderStateBinding::XRRenderStateInit; @@ -16,7 +15,6 @@ use crate::dom::bindings::codegen::Bindings::XRSessionBinding::XRFrameRequestCal use crate::dom::bindings::codegen::Bindings::XRSessionBinding::XRSessionMethods; use crate::dom::bindings::codegen::Bindings::XRSessionBinding::XRVisibilityState; use crate::dom::bindings::codegen::Bindings::XRSystemBinding::XRSessionMode; -use crate::dom::bindings::codegen::Bindings::XRWebGLLayerBinding::XRWebGLLayerMethods; use crate::dom::bindings::error::{Error, ErrorResult}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; @@ -25,8 +23,6 @@ use crate::dom::bindings::root::{Dom, DomRoot, MutDom, MutNullableDom}; use crate::dom::event::Event; use crate::dom::eventtarget::EventTarget; use crate::dom::globalscope::GlobalScope; -use crate::dom::node::Node; -use crate::dom::node::NodeDamage; use crate::dom::performance::reduce_timing_resolution; use crate::dom::promise::Promise; use crate::dom::xrframe::XRFrame; @@ -412,14 +408,6 @@ impl XRSession { "WEBXR PROFILING [raf execute]:\t{}ms", (time::precise_time_ns() - raf_start) as f64 / 1_000_000. ); - - // If the canvas element is attached to the DOM, it is now dirty, - // and we need to trigger a reflow. - base_layer - .Context() - .Canvas() - .upcast::<Node>() - .dirty(NodeDamage::OtherNodeDamage); } fn update_inline_projection_matrix(&self) { |