Let the clipboard crate handle the lack of clipboard support

This commit is contained in:
Paul Rouget 2018-09-12 04:53:06 +02:00
parent 795e7f6002
commit ec6cc56299
5 changed files with 6 additions and 29 deletions

View file

@ -136,8 +136,6 @@ pub trait WindowMethods {
fn create_event_loop_waker(&self) -> Box<EventLoopWaker>;
/// 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

View file

@ -374,10 +374,6 @@ pub struct InitialConstellationState {
/// A channel to the webgl thread.
pub webvr_chan: Option<IpcSender<WebVRMsg>>,
/// 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(),

View file

@ -150,7 +150,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(),
@ -220,7 +219,6 @@ where
mem_profiler_chan.clone(),
debugger_chan,
devtools_chan,
supports_clipboard,
&mut webrender,
webrender_document,
webrender_api_sender,
@ -492,7 +490,6 @@ fn create_constellation(
mem_profiler_chan: mem::ProfilerChan,
debugger_chan: Option<debugger::Sender>,
devtools_chan: Option<Sender<devtools_traits::DevtoolsControlMsg>>,
supports_clipboard: bool,
webrender: &mut webrender::Renderer,
webrender_document: webrender_api::DocumentId,
webrender_api_sender: webrender_api::RenderApiSender,
@ -568,7 +565,6 @@ fn create_constellation(
private_resource_threads,
time_profiler_chan,
mem_profiler_chan,
supports_clipboard,
webrender_document,
webrender_api_sender,
webgl_threads,

View file

@ -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<EventLoopWaker> {
debug!("WindowMethods::create_event_loop_waker");
self.waker.clone()

View file

@ -785,10 +785,6 @@ impl WindowMethods for Window {
fn prepare_for_composite(&self, _width: Length<u32, DevicePixel>, _height: Length<u32, DevicePixel>) -> bool {
true
}
fn supports_clipboard(&self) -> bool {
true
}
}
fn winit_phase_to_touch_event_type(phase: TouchPhase) -> TouchEventType {