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

switch to using DOMRefCell<VeqDeque<String>> for ServoParser::pending_input

Browse source
This commit is contained in:
Gregory 2016-10-16 16:26:34 +08:00
parent 759185abe0
commit f1d0c8b8df
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
components/script/dom/bindings/trace.rs
View file

@ -78,7 +78,7 @@ use serde::{Deserialize, Serialize};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::boxed::FnBox; use std::boxed::FnBox;
use std::cell::{Cell, UnsafeCell}; use std::cell::{Cell, UnsafeCell};
use std::collections::{BTreeMap, HashMap, HashSet}; use std::collections::{BTreeMap, HashMap, HashSet, VecDeque};
use std::hash::{BuildHasher, Hash}; use std::hash::{BuildHasher, Hash};
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use std::path::PathBuf; use std::path::PathBuf;
@ -208,6 +208,15 @@ impl<T: JSTraceable> JSTraceable for Vec<T> {
} }
} }
impl<T: JSTraceable> JSTraceable for VecDeque<T> {
#[inline]
fn trace(&self, trc: *mut JSTracer) {
for e in &*self {
e.trace(trc);
}
}
}
impl<T: JSTraceable> JSTraceable for (T, T, T, T) { impl<T: JSTraceable> JSTraceable for (T, T, T, T) {
fn trace(&self, trc: *mut JSTracer) { fn trace(&self, trc: *mut JSTracer) {
self.0.trace(trc); self.0.trace(trc);

9
components/script/dom/servoparser/mod.rs
View file

@ -34,6 +34,7 @@ use profile_traits::time::{TimerMetadata, TimerMetadataFrameType};
use profile_traits::time::{TimerMetadataReflowType, ProfilerCategory, profile}; use profile_traits::time::{TimerMetadataReflowType, ProfilerCategory, profile};
use script_thread::ScriptThread; use script_thread::ScriptThread;
use std::cell::Cell; use std::cell::Cell;
use std::collections::VecDeque;
use url::Url; use url::Url;
use util::resource_files::read_resource_file; use util::resource_files::read_resource_file;
use xml5ever::tokenizer::XmlTokenizer; use xml5ever::tokenizer::XmlTokenizer;
@ -51,7 +52,7 @@ pub struct ServoParser {
/// does not correspond to a page load. /// does not correspond to a page load.
pipeline: Option<PipelineId>, pipeline: Option<PipelineId>,
/// Input chunks received but not yet passed to the parser. /// Input chunks received but not yet passed to the parser.
pending_input: DOMRefCell<Vec<String>>, pending_input: DOMRefCell<VecDeque<String>>,
/// The tokenizer of this parser. /// The tokenizer of this parser.
tokenizer: DOMRefCell<Tokenizer>, tokenizer: DOMRefCell<Tokenizer>,
/// Whether to expect any further input from the associated network request. /// Whether to expect any further input from the associated network request.
@ -78,7 +79,7 @@ impl ServoParser {
reflector: Reflector::new(), reflector: Reflector::new(),
document: JS::from_ref(document), document: JS::from_ref(document),
pipeline: pipeline, pipeline: pipeline,
pending_input: DOMRefCell::new(vec![]), pending_input: DOMRefCell::new(VecDeque::new()),
tokenizer: DOMRefCell::new(tokenizer), tokenizer: DOMRefCell::new(tokenizer),
last_chunk_received: Cell::new(last_chunk_state == LastChunkState::Received), last_chunk_received: Cell::new(last_chunk_state == LastChunkState::Received),
suspended: Default::default(), suspended: Default::default(),
@ -111,7 +112,7 @@ impl ServoParser {
} }
fn push_input_chunk(&self, chunk: String) { fn push_input_chunk(&self, chunk: String) {
self.pending_input.borrow_mut().push(chunk); self.pending_input.borrow_mut().push_back(chunk);
} }
fn take_next_input_chunk(&self) -> Option<String> { fn take_next_input_chunk(&self) -> Option<String> {
@ -119,7 +120,7 @@ impl ServoParser {
if pending_input.is_empty() { if pending_input.is_empty() {
None None
} else { } else {
Some(pending_input.remove(0)) pending_input.pop_front()
} }
} }