diff options
author | Delan Azabani <dazabani@igalia.com> | 2025-01-30 19:15:35 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-01-30 11:15:35 +0000 |
commit | 5e9de2cb61fbfd82b27343bf03439838458b9848 (patch) | |
tree | 64574624cda94237bbfc443a29b792229fde0ee2 /components/script/textinput.rs | |
parent | 9eeb602f7afca502753bb8211ab646c952951761 (diff) | |
download | servo-5e9de2cb61fbfd82b27343bf03439838458b9848.tar.gz servo-5e9de2cb61fbfd82b27343bf03439838458b9848.zip |
Include `WebViewId` into EmbedderMsg variants where possible (#35211)
`EmbedderMsg` was previously paired with an implicit
`Option<WebViewId>`, even though almost all variants were either always
`Some` or always `None`, depending on whether there was a `WebView
involved.
This patch adds the `WebViewId` to as many `EmbedderMsg` variants as
possible, so we can call their associated `WebView` delegate methods
without needing to check and unwrap the `Option`. In many cases, this
required more changes to plumb through the `WebViewId`.
Notably, all `Request`s now explicitly need a `WebView` or not, in order
to ensure that it is passed when appropriate.
Signed-off-by: Delan Azabani <dazabani@igalia.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/script/textinput.rs')
-rw-r--r-- | components/script/textinput.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script/textinput.rs b/components/script/textinput.rs index d59cd5b6a5d..9cffd6dede1 100644 --- a/components/script/textinput.rs +++ b/components/script/textinput.rs @@ -10,10 +10,9 @@ use std::default::Default; use std::ops::{Add, AddAssign, Range}; use keyboard_types::{Key, KeyState, Modifiers, ShortcutMatcher}; -use script_traits::ScriptToConstellationChan; use unicode_segmentation::UnicodeSegmentation; -use crate::clipboard_provider::ClipboardProvider; +use crate::clipboard_provider::{ClipboardProvider, EmbedderClipboardProvider}; use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::EventBinding::Event_Binding::EventMethods; use crate::dom::bindings::inheritance::Castable; @@ -1150,7 +1149,7 @@ impl<T: ClipboardProvider> TextInput<T> { /// <https://www.w3.org/TR/clipboard-apis/#clipboard-actions> step 3 pub(crate) fn handle_text_clipboard_action( owning_node: &impl NodeTraits, - textinput: &DomRefCell<TextInput<ScriptToConstellationChan>>, + textinput: &DomRefCell<TextInput<EmbedderClipboardProvider>>, event: &ClipboardEvent, can_gc: CanGc, ) -> bool { |