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

auto merge of #5071 : glennw/servo/reftest-wait, r=jdm

Browse source 
This allows reftests to perform tests for incremental layout and other bugs that require rendering multiple frames.
This commit is contained in:
bors-servo 2015-02-25 21:06:57 -07:00
commit c7c399a26b
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/script_task.rs
View file

@ -22,7 +22,7 @@ use dom::bindings::structuredclone::StructuredCloneData;
use dom::bindings::trace::JSTraceable;
use dom::bindings::utils::{wrap_for_same_compartment, pre_wrap};
use dom::document::{Document, IsHTMLDocument, DocumentHelpers, DocumentProgressHandler, DocumentProgressTask, DocumentSource};
use dom::element::{Element, ActivationElementHelpers};
use dom::element::{Element, ActivationElementHelpers, AttributeHandlers};
use dom::event::{Event, EventHelpers};
use dom::uievent::UIEvent;
use dom::eventtarget::EventTarget;
@ -59,6 +59,7 @@ use net::image_cache_task::ImageCacheTask;
use net::resource_task::{ResourceTask, ControlMsg};
use net::resource_task::LoadData as NetLoadData;
use net::storage_task::StorageTask;
use string_cache::Atom;
use util::geometry::to_frac_px;
use util::smallvec::SmallVec;
use util::str::DOMString;
@ -695,8 +696,14 @@ impl ScriptTask {
*layout_join_port = None;
}
let doc = page.frame().as_ref().unwrap().document.root();
let html_element = doc.r().GetDocumentElement().root();
let reftest_wait = html_element.r().map_or(false, |elem| elem.has_class(&Atom::from_slice("reftest-wait")));
if !reftest_wait {
self.compositor.borrow_mut().set_ready_state(pipeline_id, FinishedLoading);
}
}
/// Window was resized, but this script was not active, so don't reflow yet
fn handle_resize_inactive_msg(&self, id: PipelineId, new_size: WindowSizeData) {

2
tests/wpt/metadata/FileAPI/url/url_xmlhttprequest_img.html.ini
View file

@ -2,4 +2,4 @@
type: reftest
reftype: ==
refurl: /FileAPI/url/url_xmlhttprequest_img-ref.html
expected: FAIL
expected: TIMEOUT