diff --git a/components/compositing/windowing.rs b/components/compositing/windowing.rs index 654f7341678..2e773e37aa7 100644 --- a/components/compositing/windowing.rs +++ b/components/compositing/windowing.rs @@ -136,8 +136,6 @@ pub trait WindowMethods { fn create_event_loop_waker(&self) -> Box; /// Get the coordinates of the native window, the screen and the framebuffer. fn get_coordinates(&self) -> EmbedderCoordinates; - /// Does this window support a clipboard - fn supports_clipboard(&self) -> bool; /// Set whether the application is currently animating. /// Typically, when animations are active, the window /// will want to avoid blocking on UI events, and just diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs index 826e0cd972f..a9c757cc2ba 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -374,10 +374,6 @@ pub struct InitialConstellationState { /// A channel to the webgl thread. pub webvr_chan: Option>, - - /// Whether the constellation supports the clipboard. - /// TODO: this field is not used, remove it? - pub supports_clipboard: bool, } /// Data needed for webdriver @@ -621,16 +617,12 @@ where ), }, phantom: PhantomData, - clipboard_ctx: if state.supports_clipboard { - match ClipboardContext::new() { - Ok(c) => Some(c), - Err(e) => { - warn!("Error creating clipboard context ({})", e); - None - }, - } - } else { - None + clipboard_ctx: match ClipboardContext::new() { + Ok(c) => Some(c), + Err(e) => { + warn!("Error creating clipboard context ({})", e); + None + }, }, webdriver: WebDriverData::new(), scheduler_chan: TimerScheduler::start(), diff --git a/components/servo/lib.rs b/components/servo/lib.rs index dba8ce702df..9bd7623df47 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -151,7 +151,6 @@ where create_compositor_channel(window.create_event_loop_waker()); let (embedder_proxy, embedder_receiver) = create_embedder_channel(window.create_event_loop_waker()); - let supports_clipboard = window.supports_clipboard(); let time_profiler_chan = profile_time::Profiler::create( &opts.time_profiling, opts.time_profiler_trace_path.clone(), @@ -221,7 +220,6 @@ where mem_profiler_chan.clone(), debugger_chan, devtools_chan, - supports_clipboard, &mut webrender, webrender_document, webrender_api_sender, @@ -493,7 +491,6 @@ fn create_constellation( mem_profiler_chan: mem::ProfilerChan, debugger_chan: Option, devtools_chan: Option>, - supports_clipboard: bool, webrender: &mut webrender::Renderer, webrender_document: webrender_api::DocumentId, webrender_api_sender: webrender_api::RenderApiSender, @@ -569,7 +566,6 @@ fn create_constellation( private_resource_threads, time_profiler_chan, mem_profiler_chan, - supports_clipboard, webrender_document, webrender_api_sender, webgl_threads, diff --git a/ports/libsimpleservo/src/api.rs b/ports/libsimpleservo/src/api.rs index 4e904d698f1..f3d794b6ae8 100644 --- a/ports/libsimpleservo/src/api.rs +++ b/ports/libsimpleservo/src/api.rs @@ -437,11 +437,6 @@ impl WindowMethods for ServoCallbacks { self.host_callbacks.flush(); } - fn supports_clipboard(&self) -> bool { - debug!("WindowMethods::supports_clipboard"); - false - } - fn create_event_loop_waker(&self) -> Box { debug!("WindowMethods::create_event_loop_waker"); self.waker.clone() diff --git a/ports/servo/glutin_app/window.rs b/ports/servo/glutin_app/window.rs index 783f7e9a494..628f6103d54 100644 --- a/ports/servo/glutin_app/window.rs +++ b/ports/servo/glutin_app/window.rs @@ -813,10 +813,6 @@ impl WindowMethods for Window { ) -> bool { true } - - fn supports_clipboard(&self) -> bool { - true - } } fn winit_phase_to_touch_event_type(phase: TouchPhase) -> TouchEventType {