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

Auto merge of #5992 - zmike:random-fixups, r=larsbergstrom

Browse source 
Attempt to not panic as much if the resources/ dir is not where it's expected to be.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5992)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-12 13:26:22 -05:00
commit 76225bdccb
3 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ports/cef/core.rs
View file

@ -27,15 +27,6 @@ static CEF_API_HASH_PLATFORM: &'static [u8] = b"6813214accbf2ebfb6bdcf8d00654650
#[cfg(target_os="linux")]
static CEF_API_HASH_PLATFORM: &'static [u8] = b"2bc564c3871965ef3a2531b528bda3e17fa17a6d\0";
#[cfg(target_os="linux")]
fn resources_path() -> Option<String> {
Some("../../servo/resources".to_owned())
}
#[cfg(not(target_os="linux"))]
fn resources_path() -> Option<String> {
None
}
#[no_mangle]
pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
@ -77,7 +68,7 @@ pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
temp_opts.headless = false;
temp_opts.hard_fail = false;
temp_opts.enable_text_antialiasing = true;
temp_opts.resources_path = resources_path();
temp_opts.resources_path = None;
opts::set(temp_opts);
return 1