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

Auto merge of #17872 - servo:jdm-patch-1, r=KiChjang

Browse source 
Warning patrol

This greens up every build except the android one.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17872)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-27 00:10:49 -05:00 • committed by GitHub
commit ad38516a71
3 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ports/cef/core.rs
View file

@ -13,8 +13,6 @@ 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";
@ -57,16 +55,6 @@ pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
}
}
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;

1
ports/cef/window.rs
View file

@ -31,7 +31,6 @@ 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;

5
tests/unit/script/textinput.rs
View file

@ -7,8 +7,9 @@
// 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};