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

script: change requestAnimationFrame returns the unsigned long type.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2015-09-04 15:40:30 +09:00
parent 05deb3dcc8
commit 63627405d9
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/script/dom/document.rs
View file

@ -142,11 +142,11 @@ pub struct Document {
scripting_enabled: Cell<bool>, scripting_enabled: Cell<bool>,
/// https://html.spec.whatwg.org/multipage/#animation-frame-callback-identifier /// https://html.spec.whatwg.org/multipage/#animation-frame-callback-identifier
/// Current identifier of animation frame callback /// Current identifier of animation frame callback
animation_frame_ident: Cell<i32>, animation_frame_ident: Cell<u32>,
/// https://html.spec.whatwg.org/multipage/#list-of-animation-frame-callbacks /// https://html.spec.whatwg.org/multipage/#list-of-animation-frame-callbacks
/// List of animation frame callbacks /// List of animation frame callbacks
#[ignore_heap_size_of = "closures are hard"] #[ignore_heap_size_of = "closures are hard"]
animation_frame_list: RefCell<HashMap<i32, Box<FnBox(f64)>>>, animation_frame_list: RefCell<HashMap<u32, Box<FnBox(f64)>>>,
/// Tracks all outstanding loads related to this document. /// Tracks all outstanding loads related to this document.
loader: DOMRefCell<DocumentLoader>, loader: DOMRefCell<DocumentLoader>,
/// The current active HTML parser, to allow resuming after interruptions. /// The current active HTML parser, to allow resuming after interruptions.
@ -870,7 +870,7 @@ impl Document {
} }
/// https://html.spec.whatwg.org/multipage/#dom-window-requestanimationframe /// https://html.spec.whatwg.org/multipage/#dom-window-requestanimationframe
pub fn request_animation_frame(&self, callback: Box<FnBox(f64)>) -> i32 { pub fn request_animation_frame(&self, callback: Box<FnBox(f64)>) -> u32 {
let window = self.window.root(); let window = self.window.root();
let window = window.r(); let window = window.r();
let ident = self.animation_frame_ident.get() + 1; let ident = self.animation_frame_ident.get() + 1;
@ -888,7 +888,7 @@ impl Document {
} }
/// https://html.spec.whatwg.org/multipage/#dom-window-cancelanimationframe /// https://html.spec.whatwg.org/multipage/#dom-window-cancelanimationframe
pub fn cancel_animation_frame(&self, ident: i32) { pub fn cancel_animation_frame(&self, ident: u32) {
self.animation_frame_list.borrow_mut().remove(&ident); self.animation_frame_list.borrow_mut().remove(&ident);
if self.animation_frame_list.borrow().is_empty() { if self.animation_frame_list.borrow().is_empty() {
let window = self.window.root(); let window = self.window.root();

4
components/script/dom/webidls/Window.webidl
View file

@ -56,8 +56,8 @@
//void print(); //void print();
//any showModalDialog(DOMString url, optional any argument); //any showModalDialog(DOMString url, optional any argument);
long requestAnimationFrame(FrameRequestCallback callback); unsigned long requestAnimationFrame(FrameRequestCallback callback);
void cancelAnimationFrame(long handle); void cancelAnimationFrame(unsigned long handle);
//void postMessage(any message, DOMString targetOrigin, optional sequence<Transferable> transfer); //void postMessage(any message, DOMString targetOrigin, optional sequence<Transferable> transfer);

4
components/script/dom/window.rs
View file

@ -535,7 +535,7 @@ impl WindowMethods for Window {
} }
/// https://html.spec.whatwg.org/multipage/#dom-window-requestanimationframe /// https://html.spec.whatwg.org/multipage/#dom-window-requestanimationframe
fn RequestAnimationFrame(&self, callback: Rc<FrameRequestCallback>) -> i32 { fn RequestAnimationFrame(&self, callback: Rc<FrameRequestCallback>) -> u32 {
let doc = self.Document(); let doc = self.Document();
let callback = move |now: f64| { let callback = move |now: f64| {
@ -548,7 +548,7 @@ impl WindowMethods for Window {
} }
/// https://html.spec.whatwg.org/multipage/#dom-window-cancelanimationframe /// https://html.spec.whatwg.org/multipage/#dom-window-cancelanimationframe
fn CancelAnimationFrame(&self, ident: i32) { fn CancelAnimationFrame(&self, ident: u32) {
let doc = self.Document(); let doc = self.Document();
doc.r().cancel_animation_frame(ident); doc.r().cancel_animation_frame(ident);
} }