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

Revert "temp re-set default url for cef while I figure out wtf is going on"

Browse source 
This reverts commit 8330eabac1.
This commit is contained in:
Mike Blumenkrantz 2015-05-26 18:12:03 -04:00
parent 90169e8f3b
commit aef3218169
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ports/cef/browser.rs
View file

@ -11,11 +11,13 @@ use interfaces::{cef_request_context_t};
use servo::Browser; use servo::Browser;
use types::{cef_browser_settings_t, cef_string_t, cef_window_info_t, cef_window_handle_t}; use types::{cef_browser_settings_t, cef_string_t, cef_window_info_t, cef_window_handle_t};
use window; use window;
use wrappers::CefWrap;
use compositing::windowing::{WindowNavigateMsg, WindowEvent}; use compositing::windowing::{WindowNavigateMsg, WindowEvent};
use glutin_app; use glutin_app;
use libc::c_int; use libc::c_int;
use std::cell::{Cell, RefCell, BorrowState}; use std::cell::{Cell, RefCell, BorrowState};
use std::ptr;
use std::rc::Rc; use std::rc::Rc;
use std::sync::atomic::{AtomicIsize, Ordering}; use std::sync::atomic::{AtomicIsize, Ordering};
@ -275,9 +277,9 @@ fn browser_host_create(window_info: &cef_window_info_t,
if callback_executed { if callback_executed {
browser_callback_after_created(browser.clone()); browser_callback_after_created(browser.clone());
} }
//if url != ptr::null() { if url != ptr::null() {
//unsafe { browser.downcast().frame.load_url(CefWrap::to_rust(url)); } unsafe { browser.downcast().frame.load_url(CefWrap::to_rust(url)); }
//} }
BROWSERS.with(|browsers| { BROWSERS.with(|browsers| {
browsers.borrow_mut().push(browser.clone()); browsers.borrow_mut().push(browser.clone());
}); });

4
ports/cef/core.rs
View file

@ -12,11 +12,10 @@ use util::opts;
use std::ffi; use std::ffi;
use std::str; use std::str;
use browser; use browser;
use std_url::Url;
const MAX_RENDERING_THREADS: usize = 128; const MAX_RENDERING_THREADS: usize = 128;
static HOME_URL: &'static str = "http://s27.postimg.org/vqbtrolyr/servo.jpg"; //static HOME_URL: &'static str = "http://s27.postimg.org/vqbtrolyr/servo.jpg";
static CEF_API_HASH_UNIVERSAL: &'static [u8] = b"8efd129f4afc344bd04b2feb7f73a149b6c4e27f\0"; static CEF_API_HASH_UNIVERSAL: &'static [u8] = b"8efd129f4afc344bd04b2feb7f73a149b6c4e27f\0";
#[cfg(target_os="windows")] #[cfg(target_os="windows")]
@ -75,7 +74,6 @@ pub extern "C" fn cef_initialize(args: *const cef_main_args_t,
temp_opts.hard_fail = false; temp_opts.hard_fail = false;
temp_opts.enable_text_antialiasing = true; temp_opts.enable_text_antialiasing = true;
temp_opts.resources_path = None; temp_opts.resources_path = None;
temp_opts.url = Url::parse(HOME_URL).unwrap();
opts::set(temp_opts); opts::set(temp_opts);
if unsafe { (*settings).windowless_rendering_enabled != 0 } { if unsafe { (*settings).windowless_rendering_enabled != 0 } {