auto merge of #2585 : ebalint/servo/2530, r=jdm

This commit is contained in:
bors-servo 2014-06-13 14:04:45 -04:00
commit c0576108c5
8 changed files with 455 additions and 418 deletions

View file

@ -17,7 +17,8 @@ use dom::navigator::Navigator;
use dom::performance::Performance;
use layout_interface::{ReflowForDisplay, DocumentDamageLevel};
use script_task::{ExitWindowMsg, FireTimerMsg, Page, ScriptChan, TriggerLoadMsg, TriggerFragmentMsg};
use page::Page;
use script_task::{ExitWindowMsg, FireTimerMsg, ScriptChan, TriggerLoadMsg, TriggerFragmentMsg};
use servo_msg::compositor_msg::ScriptListener;
use servo_net::image_cache_task::ImageCacheTask;
use servo_util::str::DOMString;