mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Changes based on review
This commit is contained in:
parent
af920f442b
commit
8b94a44c0b
9 changed files with 17 additions and 17 deletions
|
@ -54,7 +54,7 @@ impl BufferKey {
|
||||||
/// A helper struct to keep track of buffers in the HashMap
|
/// A helper struct to keep track of buffers in the HashMap
|
||||||
struct BufferValue<T> {
|
struct BufferValue<T> {
|
||||||
/// An array of buffers, all the same size
|
/// An array of buffers, all the same size
|
||||||
buffers: Vec<T>,
|
buffers: Vec<T>,
|
||||||
/// The counter when this size was last requested
|
/// The counter when this size was last requested
|
||||||
last_action: uint,
|
last_action: uint,
|
||||||
}
|
}
|
||||||
|
|
|
@ -256,7 +256,7 @@ impl<C: RenderListener + Send> RenderTask<C> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
UnusedBufferMsg(unused_buffers) => {
|
UnusedBufferMsg(unused_buffers) => {
|
||||||
for buffer in unused_buffers.move_iter() {
|
for buffer in unused_buffers.move_iter().rev() {
|
||||||
self.buffer_map.insert(native_graphics_context!(self), buffer);
|
self.buffer_map.insert(native_graphics_context!(self), buffer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -555,20 +555,20 @@ impl<'a> GlyphStore {
|
||||||
self.entry_buffer[i] = entry;
|
self.entry_buffer[i] = entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_glyphs_for_char_index(&mut self, i: uint, data_for_glyphs: &Vec<GlyphData>) {
|
pub fn add_glyphs_for_char_index(&mut self, i: uint, data_for_glyphs: &[GlyphData]) {
|
||||||
assert!(i < self.entry_buffer.len());
|
assert!(i < self.entry_buffer.len());
|
||||||
assert!(data_for_glyphs.len() > 0);
|
assert!(data_for_glyphs.len() > 0);
|
||||||
|
|
||||||
let glyph_count = data_for_glyphs.len();
|
let glyph_count = data_for_glyphs.len();
|
||||||
|
|
||||||
let first_glyph_data = data_for_glyphs.get(0);
|
let first_glyph_data = data_for_glyphs[0];
|
||||||
let entry = match first_glyph_data.is_missing {
|
let entry = match first_glyph_data.is_missing {
|
||||||
true => GlyphEntry::missing(glyph_count),
|
true => GlyphEntry::missing(glyph_count),
|
||||||
false => {
|
false => {
|
||||||
let glyphs_vec = slice::from_fn(glyph_count, |i| {
|
let glyphs_vec = slice::from_fn(glyph_count, |i| {
|
||||||
DetailedGlyph::new(data_for_glyphs.get(i).index,
|
DetailedGlyph::new(data_for_glyphs[i].index,
|
||||||
data_for_glyphs.get(i).advance,
|
data_for_glyphs[i].advance,
|
||||||
data_for_glyphs.get(i).offset)
|
data_for_glyphs[i].offset)
|
||||||
});
|
});
|
||||||
|
|
||||||
self.detail_store.add_detailed_glyphs_for_entry(i, glyphs_vec);
|
self.detail_store.add_detailed_glyphs_for_entry(i, glyphs_vec);
|
||||||
|
|
|
@ -425,7 +425,7 @@ impl Shaper {
|
||||||
}
|
}
|
||||||
|
|
||||||
// now add the detailed glyph entry.
|
// now add the detailed glyph entry.
|
||||||
glyphs.add_glyphs_for_char_index(char_idx, &datas);
|
glyphs.add_glyphs_for_char_index(char_idx, datas.as_slice());
|
||||||
|
|
||||||
// set the other chars, who have no glyphs
|
// set the other chars, who have no glyphs
|
||||||
let mut i = covered_byte_span.begin();
|
let mut i = covered_byte_span.begin();
|
||||||
|
|
|
@ -842,7 +842,7 @@ impl CompositorLayer {
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut unused_tiles = vec!();
|
let mut unused_tiles = vec!();
|
||||||
for buffer in new_buffers.buffers.move_iter() {
|
for buffer in new_buffers.buffers.move_iter().rev() {
|
||||||
unused_tiles.push_all_move(quadtree.add_tile_pixel(buffer.screen_pos.origin.x,
|
unused_tiles.push_all_move(quadtree.add_tile_pixel(buffer.screen_pos.origin.x,
|
||||||
buffer.screen_pos.origin.y,
|
buffer.screen_pos.origin.y,
|
||||||
buffer.resolution,
|
buffer.resolution,
|
||||||
|
|
|
@ -1133,7 +1133,7 @@ impl ScriptTask {
|
||||||
match page.get_nodes_under_mouse(&point) {
|
match page.get_nodes_under_mouse(&point) {
|
||||||
Some(node_address) => {
|
Some(node_address) => {
|
||||||
|
|
||||||
let mut target_list: Vec<JS<Node>> = vec!();
|
let mut target_list = vec!();
|
||||||
let mut target_compare = false;
|
let mut target_compare = false;
|
||||||
|
|
||||||
let mouse_over_targets = &mut *self.mouse_over_targets.borrow_mut();
|
let mouse_over_targets = &mut *self.mouse_over_targets.borrow_mut();
|
||||||
|
|
|
@ -197,18 +197,18 @@ fn compute_specificity(mut selector: &CompoundSelector,
|
||||||
};
|
};
|
||||||
if pseudo_element.is_some() { specificity.element_selectors += 1 }
|
if pseudo_element.is_some() { specificity.element_selectors += 1 }
|
||||||
|
|
||||||
simple_selectors_specificity(&selector.simple_selectors, &mut specificity);
|
simple_selectors_specificity(selector.simple_selectors.as_slice(), &mut specificity);
|
||||||
loop {
|
loop {
|
||||||
match selector.next {
|
match selector.next {
|
||||||
None => break,
|
None => break,
|
||||||
Some((ref next_selector, _)) => {
|
Some((ref next_selector, _)) => {
|
||||||
selector = &**next_selector;
|
selector = &**next_selector;
|
||||||
simple_selectors_specificity(&selector.simple_selectors, &mut specificity)
|
simple_selectors_specificity(selector.simple_selectors.as_slice(), &mut specificity)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn simple_selectors_specificity(simple_selectors: &Vec<SimpleSelector>,
|
fn simple_selectors_specificity(simple_selectors: &[SimpleSelector],
|
||||||
specificity: &mut Specificity) {
|
specificity: &mut Specificity) {
|
||||||
for simple_selector in simple_selectors.iter() {
|
for simple_selector in simple_selectors.iter() {
|
||||||
match simple_selector {
|
match simple_selector {
|
||||||
|
@ -226,7 +226,7 @@ fn compute_specificity(mut selector: &CompoundSelector,
|
||||||
=> specificity.class_like_selectors += 1,
|
=> specificity.class_like_selectors += 1,
|
||||||
&NamespaceSelector(..) => (),
|
&NamespaceSelector(..) => (),
|
||||||
&Negation(ref negated)
|
&Negation(ref negated)
|
||||||
=> simple_selectors_specificity(negated, specificity),
|
=> simple_selectors_specificity(negated.as_slice(), specificity),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -680,7 +680,7 @@ mod tests {
|
||||||
// Default namespace does apply to type selectors
|
// Default namespace does apply to type selectors
|
||||||
assert!(parse_ns("e", &namespaces) == Some(vec!(Selector{
|
assert!(parse_ns("e", &namespaces) == Some(vec!(Selector{
|
||||||
compound_selectors: Arc::new(CompoundSelector {
|
compound_selectors: Arc::new(CompoundSelector {
|
||||||
simple_selectors: vec!(
|
simple_selectors: vec!(
|
||||||
NamespaceSelector(namespace::MathML),
|
NamespaceSelector(namespace::MathML),
|
||||||
LocalNameSelector("e".to_owned()),
|
LocalNameSelector("e".to_owned()),
|
||||||
),
|
),
|
||||||
|
|
|
@ -44,7 +44,7 @@ impl Stylesheet {
|
||||||
pub fn from_bytes_iter<I: Iterator<Vec<u8>>>(
|
pub fn from_bytes_iter<I: Iterator<Vec<u8>>>(
|
||||||
mut input: I, base_url: Url, protocol_encoding_label: Option<&str>,
|
mut input: I, base_url: Url, protocol_encoding_label: Option<&str>,
|
||||||
environment_encoding: Option<EncodingRef>) -> Stylesheet {
|
environment_encoding: Option<EncodingRef>) -> Stylesheet {
|
||||||
let mut bytes = vec!();
|
let mut bytes = vec!();
|
||||||
// TODO: incremental decoding and tokinization/parsing
|
// TODO: incremental decoding and tokinization/parsing
|
||||||
for chunk in input {
|
for chunk in input {
|
||||||
bytes.push_all(chunk.as_slice())
|
bytes.push_all(chunk.as_slice())
|
||||||
|
|
|
@ -200,7 +200,7 @@ impl Profiler {
|
||||||
if data_len > 0 {
|
if data_len > 0 {
|
||||||
let (mean, median, min, max) =
|
let (mean, median, min, max) =
|
||||||
(data.iter().map(|&x|x).sum() / (data_len as f64),
|
(data.iter().map(|&x|x).sum() / (data_len as f64),
|
||||||
data.get(data_len / 2).clone(),
|
*data.get(data_len / 2),
|
||||||
data.iter().fold(f64::INFINITY, |a, &b| a.min(b)),
|
data.iter().fold(f64::INFINITY, |a, &b| a.min(b)),
|
||||||
data.iter().fold(-f64::INFINITY, |a, &b| a.max(b)));
|
data.iter().fold(-f64::INFINITY, |a, &b| a.max(b)));
|
||||||
println!("{:-35s}: {:15.4f} {:15.4f} {:15.4f} {:15.4f} {:15u}",
|
println!("{:-35s}: {:15.4f} {:15.4f} {:15.4f} {:15.4f} {:15u}",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue