Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 15:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8317 - mbrubeck:glutin-warning, r=saneyuki

Browse source 
Fix unused import warning in headless builds



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8317)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-04 09:34:24 +05:30
commit 488459f801
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ports/glutin/window.rs
View file

@ -16,7 +16,6 @@ use gleam::gl;
use glutin; use glutin;
#[cfg(feature = "window")] #[cfg(feature = "window")]
use glutin::{Api, ElementState, Event, GlRequest, MouseButton, VirtualKeyCode, MouseScrollDelta}; use glutin::{Api, ElementState, Event, GlRequest, MouseButton, VirtualKeyCode, MouseScrollDelta};
use glutin::{TouchPhase};
use layers::geometry::DevicePixel; use layers::geometry::DevicePixel;
use layers::platform::surface::NativeDisplay; use layers::platform::surface::NativeDisplay;
#[cfg(feature = "window")] #[cfg(feature = "window")]
@ -158,8 +157,6 @@ impl Window {
} }
fn handle_window_event(&self, event: glutin::Event) -> bool { fn handle_window_event(&self, event: glutin::Event) -> bool {
use script_traits::{TouchEventType, TouchId};
match event { match event {
Event::KeyboardInput(element_state, _scan_code, virtual_key_code) => { Event::KeyboardInput(element_state, _scan_code, virtual_key_code) => {
if virtual_key_code.is_some() { if virtual_key_code.is_some() {
@ -210,6 +207,9 @@ impl Window {
self.scroll_window(dx, dy); self.scroll_window(dx, dy);
}, },
Event::Touch(touch) => { Event::Touch(touch) => {
use glutin::TouchPhase;
use script_traits::{TouchEventType, TouchId};
let phase = match touch.phase { let phase = match touch.phase {
TouchPhase::Started => TouchEventType::Down, TouchPhase::Started => TouchEventType::Down,
TouchPhase::Moved => TouchEventType::Move, TouchPhase::Moved => TouchEventType::Move,