Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some build warnings.

Browse source
This commit is contained in:
Ms2ger 2016-06-01 10:35:45 +02:00
parent 09e6f4ac54
commit 46ea78e960
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/compositing/compositor.rs
View file

@ -1932,12 +1932,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
scroll_offset: scroll_layer_state.scroll_offset, scroll_offset: scroll_layer_state.scroll_offset,
}; };
let pipeline_id = scroll_layer_state.pipeline_id; let pipeline_id = scroll_layer_state.pipeline_id;
match stacking_context_scroll_states_per_pipeline.entry(pipeline_id) { stacking_context_scroll_states_per_pipeline
Vacant(mut entry) => { .entry(pipeline_id)
entry.insert(vec![stacking_context_scroll_state]); .or_insert(vec![])
} .push(stacking_context_scroll_state);
Occupied(mut entry) => entry.get_mut().push(stacking_context_scroll_state),
}
} }
for (pipeline_id, stacking_context_scroll_states) in for (pipeline_id, stacking_context_scroll_states) in

1
components/script/dom/dedicatedworkerglobalscope.rs
View file

@ -212,7 +212,6 @@ impl DedicatedWorkerGlobalScope {
worker_url: Url, worker_url: Url,
id: PipelineId, id: PipelineId,
from_devtools_receiver: IpcReceiver<DevtoolScriptControlMsg>, from_devtools_receiver: IpcReceiver<DevtoolScriptControlMsg>,
parent_rt: SharedRt,
worker_rt_for_mainthread: Arc<Mutex<Option<SharedRt>>>, worker_rt_for_mainthread: Arc<Mutex<Option<SharedRt>>>,
worker: TrustedWorkerAddress, worker: TrustedWorkerAddress,
parent_sender: Box<ScriptChan + Send>, parent_sender: Box<ScriptChan + Send>,

6
components/script/dom/worker.rs
View file

@ -22,7 +22,7 @@ use dom::messageevent::MessageEvent;
use dom::workerglobalscope::WorkerGlobalScopeInit; use dom::workerglobalscope::WorkerGlobalScopeInit;
use ipc_channel::ipc; use ipc_channel::ipc;
use js::jsapi::{HandleValue, JSContext, JSRuntime, RootedValue}; use js::jsapi::{HandleValue, JSContext, JSRuntime, RootedValue};
use js::jsapi::{JSAutoCompartment, JS_GetRuntime, JS_RequestInterruptCallback}; use js::jsapi::{JSAutoCompartment, JS_RequestInterruptCallback};
use js::jsval::UndefinedValue; use js::jsval::UndefinedValue;
use js::rust::Runtime; use js::rust::Runtime;
use msg::constellation_msg::{PipelineId, ReferrerPolicy}; use msg::constellation_msg::{PipelineId, ReferrerPolicy};
@ -146,10 +146,8 @@ impl Worker {
closing: closing, closing: closing,
}; };
let shared_rt = SharedRt { rt: unsafe { JS_GetRuntime(global.get_cx()) } };
DedicatedWorkerGlobalScope::run_worker_scope( DedicatedWorkerGlobalScope::run_worker_scope(
init, worker_url, global.pipeline(), devtools_receiver, shared_rt, worker.runtime.clone(), worker_ref, init, worker_url, global.pipeline(), devtools_receiver, worker.runtime.clone(), worker_ref,
global.script_chan(), sender, receiver, worker_load_origin); global.script_chan(), sender, receiver, worker_load_origin);
Ok(worker) Ok(worker)

1
components/script/script_thread.rs
View file

@ -88,7 +88,6 @@ use std::borrow::ToOwned;
use std::cell::{Cell, RefCell}; use std::cell::{Cell, RefCell};
use std::collections::HashSet; use std::collections::HashSet;
use std::option::Option; use std::option::Option;
use std::ptr;
use std::rc::Rc; use std::rc::Rc;
use std::result::Result; use std::result::Result;
use std::sync::atomic::{Ordering, AtomicBool}; use std::sync::atomic::{Ordering, AtomicBool};