servo: Merge #4830 - Load android OpenGL pointers (fixes #4824) (from glennw:android-gl); r=mbrubeck

Source-Repo: https://github.com/servo/servo
Source-Revision: a766f1a7060d367ad1f564b2a0fcbd45c8accb63

servo/ports/glutin/window.rs

@@ -89,7 +89,7 @@ impl Window {
 
         glutin_window.set_window_resize_callback(Some(Window::nested_window_resize as fn(u32, u32)));
 
-        Window::load_gl_functions(&glutin_window);
+        gl::load_with(|s| glutin_window.get_proc_address(s));
 
         let window = Window {
             window: glutin_window,
@@ -134,15 +134,6 @@ impl Window {
         (2, 0)
     }
 
-    #[cfg(not(target_os="android"))]
-    fn load_gl_functions(window: &glutin::Window) {
-        gl::load_with(|s| window.get_proc_address(s));
-    }
-
-    #[cfg(target_os="android")]
-    fn load_gl_functions(_: &glutin::Window) {
-    }
-
     fn handle_window_event(&self, event: glutin::Event) -> bool {
         match event {
             Event::KeyboardInput(element_state, _scan_code, virtual_key_code) => {