Switch from poll_events to wait_events.

This fixes 100% CPU usage during idle.
servo · Mar 19, 2015 · f02c550 · f02c550 · bors-servo · Mar 19, 2015
1 parent 3495041
commit f02c550
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
@@ -28,6 +28,7 @@ path = "../../components/util"
 
 [dependencies.glutin]
 git = "https://github.com/servo/glutin"
+branch = "servo"
 
 [dependencies.gleam]
 git = "https://github.com/servo/gleam"

diff --git a/ports/glutin/window.rs b/ports/glutin/window.rs
@@ -271,16 +271,8 @@ impl Window {
                 }
             }
         } else {
-            // GWTODO: Something has changed in the wait_events
-            // behaviour in glutin. Switching to poll events
-            // for now, so that things display correctly,
-            // need to fix glutin / handle the changed behaviour.
-            for event in self.window.poll_events() {
-                close_event = self.handle_window_event(event);
-                if close_event {
-                    break;
-                }
-            }
+            let event = self.window.wait_events().next().unwrap();
+            close_event = self.handle_window_event(event);
         }
 
         if close_event || self.window.is_closed() {