servo: Merge #10186 - fix #10183, forward navigation key should not require shift to work (from matthiaskrgr:fix_10183); r=Manishearth
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 27 Mar 2016 01:15:24 +0500
changeset 338333 fd841d5021109b3d5b7acb48d95ba2c3f18abf22
parent 338332 2408da1cfa1ddf3397437a163ff953b0096b2089
child 338334 cedf53c1fcef2fb686ce9950d3a38d0cf58813f3
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersManishearth
servo: Merge #10186 - fix #10183, forward navigation key should not require shift to work (from matthiaskrgr:fix_10183); r=Manishearth Source-Repo: https://github.com/servo/servo Source-Revision: 68a8085a2f11d052948145980a0bf8a46471e3a7
servo/ports/glutin/window.rs
--- a/servo/ports/glutin/window.rs
+++ b/servo/ports/glutin/window.rs
@@ -722,23 +722,17 @@ impl WindowMethods for Window {
             (_, Key::Minus) if mods == CMD_OR_CONTROL | ALT => {
                 self.event_queue.borrow_mut().push(WindowEvent::PinchZoom(1.0 / 1.1));
             }
             (CMD_OR_CONTROL, Key::Num0) |
             (CMD_OR_CONTROL, Key::Kp0) => {
                 self.event_queue.borrow_mut().push(WindowEvent::ResetZoom);
             }
 
-            (SHIFT, Key::Backspace) => {
-                self.event_queue.borrow_mut().push(WindowEvent::Navigation(WindowNavigateMsg::Forward));
-            }
-            (NONE, Key::Backspace) => {
-                self.event_queue.borrow_mut().push(WindowEvent::Navigation(WindowNavigateMsg::Back));
-            }
-            (SHIFT, Key::NavigateForward) => {
+            (NONE, Key::NavigateForward) => {
                 self.event_queue.borrow_mut().push(WindowEvent::Navigation(WindowNavigateMsg::Forward));
             }
             (NONE, Key::NavigateBackward) => {
                 self.event_queue.borrow_mut().push(WindowEvent::Navigation(WindowNavigateMsg::Back));
             }
 
             (NONE, Key::Escape) => {
                 self.event_queue.borrow_mut().push(WindowEvent::Quit);