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

Fix #6680

Browse source
This commit is contained in:
Bogdan Cuza 2015-07-21 16:35:50 +03:00
parent e10a524c81
commit 681b11c08b
7 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/layout/css/matching.rs
View file

@ -11,7 +11,7 @@ use context::SharedLayoutContext;
use css::node_style::StyledNode;
use data::LayoutDataWrapper;
use incremental::{self, RestyleDamage};
use smallvec::SmallVec16;
use smallvec::SmallVec;
use wrapper::{LayoutElement, LayoutNode};
use script::dom::characterdata::CharacterDataTypeId;
@ -38,7 +38,7 @@ use util::opts;
use util::vec::ForgetfulSink;
pub struct ApplicableDeclarations {
pub normal: SmallVec16<DeclarationBlock>,
pub normal: SmallVec<[DeclarationBlock; 16]>,
pub before: Vec<DeclarationBlock>,
pub after: Vec<DeclarationBlock>,
@ -49,7 +49,7 @@ pub struct ApplicableDeclarations {
impl ApplicableDeclarations {
pub fn new() -> ApplicableDeclarations {
ApplicableDeclarations {
normal: SmallVec16::new(),
normal: SmallVec::new(),
before: Vec::new(),
after: Vec::new(),
normal_shareable: false,
@ -57,7 +57,7 @@ impl ApplicableDeclarations {
}
pub fn clear(&mut self) {
self.normal = SmallVec16::new();
self.normal = SmallVec::new();
self.before = Vec::new();
self.after = Vec::new();
self.normal_shareable = false;

6
components/layout/generated_content.rs
View file

@ -13,7 +13,7 @@ use flow::{self, AFFECTS_COUNTERS, Flow, HAS_COUNTER_AFFECTING_CHILDREN, Immutab
use flow::{InorderFlowTraversal};
use fragment::{Fragment, GeneratedContentInfo, SpecificFragmentInfo, UnscannedTextFragmentInfo};
use incremental::{self, RESOLVE_GENERATED_CONTENT};
use smallvec::SmallVec8;
use smallvec::SmallVec;
use text::TextRunScanner;
use gfx::display_list::OpaqueNode;
@ -522,7 +522,7 @@ pub fn static_representation(list_style_type: list_style_type::T) -> char {
/// Pushes the string that represents the value rendered using the given *alphabetic system* onto
/// the accumulator per CSS-COUNTER-STYLES § 3.1.4.
fn push_alphabetic_representation(mut value: i32, system: &[char], accumulator: &mut String) {
let mut string = SmallVec8::new();
let mut string: SmallVec<[char; 8]> = SmallVec::new();
while value != 0 {
// Step 1.
value = value - 1;
@ -545,7 +545,7 @@ fn push_numeric_representation(mut value: i32, system: &[char], accumulator: &mu
}
// Step 2.
let mut string = SmallVec8::new();
let mut string: SmallVec<[char; 8]> = SmallVec::new();
while value != 0 {
// Step 2.1.
string.push(system[(value as usize) % system.len()]);