mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
5e9de2cb61
`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>
39 lines
1.3 KiB
Rust
39 lines
1.3 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
use base::id::WebViewId;
|
|
use embedder_traits::EmbedderMsg;
|
|
use ipc_channel::ipc::channel;
|
|
use script_traits::{ScriptMsg, ScriptToConstellationChan};
|
|
|
|
pub trait ClipboardProvider {
|
|
// blocking method to get the clipboard contents
|
|
fn clipboard_contents(&mut self) -> String;
|
|
// blocking method to set the clipboard contents
|
|
fn set_clipboard_contents(&mut self, _: String);
|
|
}
|
|
|
|
pub(crate) struct EmbedderClipboardProvider {
|
|
pub constellation_sender: ScriptToConstellationChan,
|
|
pub webview_id: WebViewId,
|
|
}
|
|
|
|
impl ClipboardProvider for EmbedderClipboardProvider {
|
|
fn clipboard_contents(&mut self) -> String {
|
|
let (tx, rx) = channel().unwrap();
|
|
self.constellation_sender
|
|
.send(ScriptMsg::ForwardToEmbedder(
|
|
EmbedderMsg::GetClipboardContents(self.webview_id, tx),
|
|
))
|
|
.unwrap();
|
|
rx.recv().unwrap()
|
|
}
|
|
fn set_clipboard_contents(&mut self, s: String) {
|
|
self.constellation_sender
|
|
.send(ScriptMsg::ForwardToEmbedder(
|
|
EmbedderMsg::SetClipboardContents(self.webview_id, s),
|
|
))
|
|
.unwrap();
|
|
}
|
|
}
|