diff options
author | bors-servo <infra@servo.org> | 2023-05-13 16:32:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-13 16:32:55 +0200 |
commit | 8dfd613aa188d2271d692a31192284eabdaf9f9d (patch) | |
tree | ea4297cd765328c98911757730bdc0b301e8000f /components/layout/context.rs | |
parent | 45dd2764af657948aa2124473e562ead5622b33c (diff) | |
parent | 72b5fcd0b69201bd5cda125821dd90555490b45d (diff) | |
download | servo-8dfd613aa188d2271d692a31192284eabdaf9f9d.tar.gz servo-8dfd613aa188d2271d692a31192284eabdaf9f9d.zip |
Auto merge of #29727 - mrobinson:more-layout-dom-cleanup, r=jdm
More cleanup of the layout DOM wrappers
This PR includes two commits which continue to clean up the layout DOM wrappers.
- in the first the unused `DangerousThreadSafeLayoutNode` trait is removed
- in the second DOM-related code is combined into one source file in Layout 2020 and some traits are combined and removed.
---
<!-- 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 fix #29688
- [x] These changes fix #29722
- [x] These changes do not require tests because they do not change behavior.
<!-- 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.-->
<!-- 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/layout/context.rs')
-rw-r--r-- | components/layout/context.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/layout/context.rs b/components/layout/context.rs index a17bc1db4ee..d8d0c8b47a1 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -5,7 +5,6 @@ //! Data needed by the layout thread. use crate::display_list::items::{OpaqueNode, WebRenderImageInfo}; -use crate::opaque_node::OpaqueNodeMethods; use fnv::FnvHasher; use gfx::font_cache_thread::FontCacheThread; use gfx::font_context::FontContext; @@ -121,7 +120,7 @@ impl<'a> LayoutContext<'a> { ImageCacheResult::Pending(id) => { let image = PendingImage { state: PendingImageState::PendingResponse, - node: node.to_untrusted_node_address(), + node: node.into(), id, origin: self.origin.clone(), }; @@ -132,7 +131,7 @@ impl<'a> LayoutContext<'a> { ImageCacheResult::ReadyForRequest(id) => { let image = PendingImage { state: PendingImageState::Unrequested(url), - node: node.to_untrusted_node_address(), + node: node.into(), id, origin: self.origin.clone(), }; |