Fix build errors after rebase

This commit is contained in:
Fernando Jiménez Moreno 2018-07-13 15:35:19 +02:00
parent 4059e16a15
commit 1649b6a528
8 changed files with 383 additions and 13 deletions

View file

@ -90,7 +90,7 @@ servo_geometry = {path = "../geometry" }
servo-media = {git = "https://github.com/servo/media"}
servo_rand = {path = "../rand"}
servo_url = {path = "../url"}
smallvec = "0.6"
smallvec = "0.6.2"
style = {path = "../style", features = ["servo"]}
style_traits = {path = "../style_traits"}
swapper = "0.1"

View file

@ -43,7 +43,7 @@ use std::collections::{HashMap, VecDeque};
use std::mem;
use std::rc::Rc;
use std::sync::{Arc, Mutex};
use task_source::TaskSource;
use task_source::{TaskSource, TaskSourceName};
use uuid::Uuid;
#[allow(dead_code)]
@ -380,8 +380,8 @@ impl BaseAudioContextMethods for BaseAudioContext {
let this_ = this.clone();
let task_source = window.dom_manipulation_task_source();
let task_source_ = window.dom_manipulation_task_source();
let canceller = window.task_canceller();
let canceller_ = window.task_canceller();
let canceller = window.task_canceller(TaskSourceName::DOMManipulation);
let canceller_ = window.task_canceller(TaskSourceName::DOMManipulation);
let callbacks = AudioDecoderCallbacks::new()
.eos(move || {
let _ = task_source.queue_with_canceller(