corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

servo: Merge #5567 - Make mouse_over_targets a RootedVec (from boghison:document_rootedvec); r=jdm

Browse Source 
Fixes #5539

Source-Repo: https://github.com/servo/servo
Source-Revision: 331708f0f6d4bff8cec608e963fb24f79cf1ffca
This commit is contained in:
Bogdan Cuza
2015-04-19 09:05:23 -05:00
parent 3a07d505df
commit 8a20ec7f7a
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
servo/components/script/script_task.rs
View File

@@ -28,7 +28,7 @@ use dom::bindings::js::{JS, JSRef, OptionalRootable, RootedReference};
use dom::bindings::js::{RootCollection, RootCollectionPtr};
use dom::bindings::refcounted::{LiveDOMReferences, Trusted, TrustedReference};
use dom::bindings::structuredclone::StructuredCloneData;
use dom::bindings::trace::{JSTraceable, trace_collections};
use dom::bindings::trace::{JSTraceable, trace_collections, RootedVec};
use dom::bindings::utils::{wrap_for_same_compartment, pre_wrap};
use dom::document::{Document, IsHTMLDocument, DocumentHelpers, DocumentProgressHandler, DocumentProgressTask, DocumentSource};
use dom::element::{Element, AttributeHandlers};
@@ -1243,9 +1243,11 @@ impl ScriptTask {
}
let page = get_page(&self.root_page(), pipeline_id);
let document = page.document().root();
let mouse_over_targets = &mut *self.mouse_over_targets.borrow_mut();
let mut mouse_over_targets = RootedVec::new();
mouse_over_targets.append(&mut *self.mouse_over_targets.borrow_mut());
document.r().handle_mouse_move_event(self.js_runtime.ptr, point, mouse_over_targets);
document.r().handle_mouse_move_event(self.js_runtime.ptr, point, &mut mouse_over_targets);
*self.mouse_over_targets.borrow_mut() = mouse_over_targets.clone();
}
KeyEvent(key, state, modifiers) => {