servo: Merge #17872 - Warning patrol (from servo:jdm-patch-1); r=KiChjang
authorJosh Matthews <josh@joshmatthews.net>
Thu, 27 Jul 2017 00:10:49 -0500
changeset 419971 66fb4ab16802bf01b98e2d970c341e02d939c69c
parent 419970 8ab4d7eefbf6ee77dff316c1960892c06d347010
child 419972 f683a2f11afbbeb8fbd750596f750d87d77e35e0
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersKiChjang
bugs17872
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
servo: Merge #17872 - Warning patrol (from servo:jdm-patch-1); r=KiChjang This greens up every build except the android one. Source-Repo: https://github.com/servo/servo Source-Revision: ad38516a71f04b7271d1572f03a9412b1c2b2f58
servo/ports/cef/core.rs
servo/ports/cef/window.rs
servo/tests/unit/script/textinput.rs
--- a/servo/ports/cef/core.rs
+++ b/servo/ports/cef/core.rs
@@ -8,18 +8,16 @@ use types::{cef_main_args_t, cef_setting
 use window::init_window;
 
 use browser;
 use libc::{c_char, c_int, c_void};
 use servo_config::opts;
 use std::ffi;
 use std::str;
 
-const MAX_RENDERING_THREADS: usize = 128;
-
 //static HOME_URL: &'static str = "http://s27.postimg.org/vqbtrolyr/servo.jpg";
 
 static CEF_API_HASH_UNIVERSAL: &'static [u8] = b"8efd129f4afc344bd04b2feb7f73a149b6c4e27f\0";
 #[cfg(target_os="windows")]
 static CEF_API_HASH_PLATFORM: &'static [u8] = b"5c7f3e50ff5265985d11dc1a466513e25748bedd\0";
 #[cfg(target_os="macos")]
 static CEF_API_HASH_PLATFORM: &'static [u8] = b"6813214accbf2ebfb6bdcf8d00654650b251bf3d\0";
 #[cfg(target_os="linux")]
@@ -52,26 +50,16 @@ pub extern "C" fn cef_initialize(args: *
                     if !handler.is_null() {
                         (*handler).on_context_initialized.map(|hcb| hcb(handler));
                     }
             });
             CEF_APP = application;
         }
     }
 
-    let rendering_threads = unsafe {
-        if ((*settings).rendering_threads as usize) < 1 {
-            1
-        } else if (*settings).rendering_threads as usize > MAX_RENDERING_THREADS {
-            MAX_RENDERING_THREADS
-        } else {
-            (*settings).rendering_threads as usize
-        }
-    };
-
     let mut temp_opts = opts::default_opts();
     temp_opts.headless = false;
     temp_opts.hard_fail = false;
     temp_opts.enable_text_antialiasing = true;
     temp_opts.enable_canvas_antialiasing = true;
     temp_opts.url = None;
     opts::set_defaults(temp_opts);
 
--- a/servo/ports/cef/window.rs
+++ b/servo/ports/cef/window.rs
@@ -26,17 +26,16 @@ use net_traits::net_error_list::NetError
 use script_traits::LoadData;
 use servo::ipc_channel::ipc::IpcSender;
 use servo_geometry::DeviceIndependentPixel;
 use std::cell::RefCell;
 use std::ffi::CString;
 use std::os::raw::{c_char, c_void};
 use std::ptr;
 use std::rc::Rc;
-use std::sync::mpsc::{Sender, channel};
 use servo_url::ServoUrl;
 use style_traits::cursor::Cursor;
 use style_traits::DevicePixel;
 #[cfg(target_os="linux")]
 extern crate x11;
 #[cfg(target_os="linux")]
 use self::x11::xlib::{XInitThreads,XOpenDisplay};
 
--- a/servo/tests/unit/script/textinput.rs
+++ b/servo/tests/unit/script/textinput.rs
@@ -2,18 +2,19 @@
 // file at the top-level directory of this distribution.
 //
 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use msg::constellation_msg::{ALT, CONTROL, SUPER};
-use msg::constellation_msg::{Key, KeyModifiers};
+#[cfg(target_os = "macos")]
+use msg::constellation_msg::{ALT, SUPER};
+use msg::constellation_msg::{Key, KeyModifiers, CONTROL};
 use script::clipboard_provider::DummyClipboardContext;
 use script::test::DOMString;
 use script::textinput::{TextInput, TextPoint, Selection, Lines, Direction, SelectionDirection};
 
 fn text_input(lines: Lines, s: &str) -> TextInput<DummyClipboardContext> {
     TextInput::new(lines,
                    DOMString::from(s),
                    DummyClipboardContext::new(""),