aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-02-17 14:35:26 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2016-02-17 14:35:26 +0530
commitc075092fe067292b58a781169da937d1f047b62e (patch)
tree9b9c59498cadd8863b2066044176cfc95fb091ad /components/script
parent949a2d3d11d41912fb30e2d152045beb8c2aeebc (diff)
parent43d527fcc84efd76a42dd85a7cb6331f391ad005 (diff)
downloadservo-c075092fe067292b58a781169da937d1f047b62e.tar.gz
servo-c075092fe067292b58a781169da937d1f047b62e.zip
Auto merge of #9657 - zakorgy:refactor, r=KiChjang
Move parse_integer and parse_unsigned_integer from util::str to style::attr Fixes #9637 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9657) <!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/htmltableelement.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs
index c2a2e31d2b7..94c0b6dc986 100644
--- a/components/script/dom/htmltableelement.rs
+++ b/components/script/dom/htmltableelement.rs
@@ -18,7 +18,8 @@ use dom::node::{Node, document_from_node};
use dom::virtualmethods::VirtualMethods;
use std::cell::Cell;
use string_cache::Atom;
-use util::str::{self, DOMString, LengthOrPercentageOrAuto};
+use style::attr::parse_unsigned_integer;
+use util::str::{DOMString, LengthOrPercentageOrAuto};
#[dom_struct]
pub struct HTMLTableElement {
@@ -176,12 +177,12 @@ impl VirtualMethods for HTMLTableElement {
atom!("border") => {
// According to HTML5 § 14.3.9, invalid values map to 1px.
self.border.set(mutation.new_value(attr).map(|value| {
- str::parse_unsigned_integer(value.chars()).unwrap_or(1)
+ parse_unsigned_integer(value.chars()).unwrap_or(1)
}));
}
atom!("cellspacing") => {
self.cellspacing.set(mutation.new_value(attr).and_then(|value| {
- str::parse_unsigned_integer(value.chars())
+ parse_unsigned_integer(value.chars())
}));
},
_ => {},