aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/constellation/Cargo.toml1
-rw-r--r--components/constellation/constellation.rs28
-rw-r--r--components/constellation/lib.rs1
-rw-r--r--components/servo/Cargo.lock56
-rw-r--r--ports/cef/Cargo.lock56
-rw-r--r--ports/cef/window.rs2
-rw-r--r--ports/glutin/window.rs2
7 files changed, 4 insertions, 142 deletions
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
index f2cf43340de..83d8aac997a 100644
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@@ -13,7 +13,6 @@ path = "lib.rs"
backtrace = "0.2.1"
canvas = {path = "../canvas"}
canvas_traits = {path = "../canvas_traits"}
-clipboard = {git = "https://github.com/aweinstock314/rust-clipboard"}
compositing = {path = "../compositing"}
devtools_traits = {path = "../devtools_traits"}
euclid = "0.7.1"
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index 2b0462c8017..2b0fc886af6 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -13,7 +13,6 @@ use backtrace::Backtrace;
use canvas::canvas_paint_thread::CanvasPaintThread;
use canvas::webgl_paint_thread::WebGLPaintThread;
use canvas_traits::CanvasMsg;
-use clipboard::ClipboardContext;
use compositing::SendableFrameTree;
use compositing::compositor_thread::CompositorProxy;
use compositing::compositor_thread::Msg as ToCompositorMsg;
@@ -172,9 +171,6 @@ pub struct Constellation<Message, LTF, STF> {
window_size: WindowSizeData,
- /// Means of accessing the clipboard
- clipboard_ctx: Option<ClipboardContext>,
-
/// Bits of state used to interact with the webdriver implementation
webdriver: WebDriverData,
@@ -476,11 +472,6 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
ScaleFactor::new(opts::get().device_pixels_per_px.unwrap_or(1.0)),
},
phantom: PhantomData,
- clipboard_ctx: if state.supports_clipboard {
- ClipboardContext::new().ok()
- } else {
- None
- },
webdriver: WebDriverData::new(),
scheduler_chan: TimerScheduler::start(),
child_processes: Vec::new(),
@@ -851,26 +842,11 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
}
}
FromScriptMsg::GetClipboardContents(sender) => {
- let result = match self.clipboard_ctx {
- Some(ref ctx) => match ctx.get_contents() {
- Ok(result) => result,
- Err(e) => {
- warn!("Error getting clipboard contents ({}), defaulting to empty string", e);
- "".to_owned()
- },
- },
- None => "".to_owned()
- };
- if let Err(e) = sender.send(result) {
+ if let Err(e) = sender.send("".to_owned()) {
warn!("Failed to send clipboard ({})", e);
}
}
- FromScriptMsg::SetClipboardContents(s) => {
- if let Some(ref mut ctx) = self.clipboard_ctx {
- if let Err(e) = ctx.set_contents(s) {
- warn!("Error setting clipboard contents ({})", e);
- }
- }
+ FromScriptMsg::SetClipboardContents(_) => {
}
FromScriptMsg::SetVisible(pipeline_id, visible) => {
debug!("constellation got set visible messsage");
diff --git a/components/constellation/lib.rs b/components/constellation/lib.rs
index aeeeae8a1d2..d4df0d47b1a 100644
--- a/components/constellation/lib.rs
+++ b/components/constellation/lib.rs
@@ -15,7 +15,6 @@
extern crate backtrace;
extern crate canvas;
extern crate canvas_traits;
-extern crate clipboard;
extern crate compositing;
extern crate devtools_traits;
extern crate euclid;
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index e8db00d2aa6..55a1d808087 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -174,11 +174,6 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "block"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
name = "blurz"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -264,29 +259,6 @@ dependencies = [
]
[[package]]
-name = "clipboard"
-version = "0.1.2"
-source = "git+https://github.com/aweinstock314/rust-clipboard#f4c5c1d3c1759f0a167091405d11af1f9584fb1f"
-dependencies = [
- "clipboard-win 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "clipboard-win"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "windows-error 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "cmake"
version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -360,7 +332,6 @@ dependencies = [
"backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
- "clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)",
"compositing 0.0.1",
"devtools_traits 0.0.1",
"euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1568,24 +1539,6 @@ dependencies = [
]
[[package]]
-name = "objc-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "odds"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2656,15 +2609,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "windows-error"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "ws2_32-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 26e0b902f4c..cc6112d0ef8 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -148,11 +148,6 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "block"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
name = "blurz"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -238,29 +233,6 @@ dependencies = [
]
[[package]]
-name = "clipboard"
-version = "0.1.2"
-source = "git+https://github.com/aweinstock314/rust-clipboard#f4c5c1d3c1759f0a167091405d11af1f9584fb1f"
-dependencies = [
- "clipboard-win 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc-foundation 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "x11 2.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "clipboard-win"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "user32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "windows-error 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "cmake"
version = "0.1.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -319,7 +291,6 @@ dependencies = [
"backtrace 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"canvas 0.0.1",
"canvas_traits 0.0.1",
- "clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)",
"compositing 0.0.1",
"devtools_traits 0.0.1",
"euclid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1442,24 +1413,6 @@ dependencies = [
]
[[package]]
-name = "objc-foundation"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "block 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "objc_id"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "objc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "odds"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2518,15 +2471,6 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
-name = "windows-error"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
name = "ws2_32-sys"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/ports/cef/window.rs b/ports/cef/window.rs
index e5c2cd5f4db..4e0b67a96b0 100644
--- a/ports/cef/window.rs
+++ b/ports/cef/window.rs
@@ -504,7 +504,7 @@ impl WindowMethods for Window {
}
fn supports_clipboard(&self) -> bool {
- true
+ false
}
}
diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
index 4e154a5f677..4327f80412a 100644
--- a/ports/glutin/window.rs
+++ b/ports/glutin/window.rs
@@ -930,7 +930,7 @@ impl WindowMethods for Window {
}
fn supports_clipboard(&self) -> bool {
- true
+ false
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 02:18:52 +0000