Skip to content
Permalink
Browse files

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

…ng on"

This reverts commit 8330eab.
  • Loading branch information
Mike Blumenkrantz
Mike Blumenkrantz committed May 27, 2015
1 parent 90169e8 commit aef321816969a24c050c9854c3526dc97b0f57e7
Showing with 6 additions and 6 deletions.
  1. +5 −3 ports/cef/browser.rs
  2. +1 −3 ports/cef/core.rs
@@ -11,11 +11,13 @@ use interfaces::{cef_request_context_t};
use servo::Browser;
use types::{cef_browser_settings_t, cef_string_t, cef_window_info_t, cef_window_handle_t};
use window;
use wrappers::CefWrap;

use compositing::windowing::{WindowNavigateMsg, WindowEvent};
use glutin_app;
use libc::c_int;
use std::cell::{Cell, RefCell, BorrowState};
use std::ptr;
use std::rc::Rc;
use std::sync::atomic::{AtomicIsize, Ordering};

@@ -275,9 +277,9 @@ fn browser_host_create(window_info: &cef_window_info_t,
if callback_executed {
browser_callback_after_created(browser.clone());
}
//if url != ptr::null() {
//unsafe { browser.downcast().frame.load_url(CefWrap::to_rust(url)); }
//}
if url != ptr::null() {
unsafe { browser.downcast().frame.load_url(CefWrap::to_rust(url)); }
}
BROWSERS.with(|browsers| {
browsers.borrow_mut().push(browser.clone());
});
@@ -12,11 +12,10 @@ use util::opts;
use std::ffi;
use std::str;
use browser;
use std_url::Url;

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";
#[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.enable_text_antialiasing = true;
temp_opts.resources_path = None;
temp_opts.url = Url::parse(HOME_URL).unwrap();
opts::set(temp_opts);

if unsafe { (*settings).windowless_rendering_enabled != 0 } {

0 comments on commit aef3218

Please sign in to comment.
You can’t perform that action at this time.