aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/components/main/layout/box.rs4
-rw-r--r--src/components/script/dom/document.rs4
-rw-r--r--src/components/script/dom/element.rs10
-rw-r--r--src/components/script/dom/htmldocument.rs4
-rw-r--r--src/components/script/dom/htmlimageelement.rs2
-rw-r--r--src/components/script/dom/htmlscriptelement.rs2
-rw-r--r--src/components/script/html/hubbub_html_parser.rs6
-rwxr-xr-xsrc/components/script/script_task.rs4
-rw-r--r--src/components/style/selector_matching.rs18
-rw-r--r--src/components/util/tree.rs2
10 files changed, 27 insertions, 29 deletions
diff --git a/src/components/main/layout/box.rs b/src/components/main/layout/box.rs
index 466aca72f71..1c55b93dc49 100644
--- a/src/components/main/layout/box.rs
+++ b/src/components/main/layout/box.rs
@@ -112,7 +112,7 @@ impl ImageBoxInfo {
// TODO: This could probably go somewhere else
pub fn image_width(&self, base: &Box) -> Au {
let attr_width: Option<int> = do base.node.with_imm_element |elt| {
- match elt.get_attr("width") {
+ match elt.get_attr(None, "width") {
Some(width) => {
FromStr::from_str(width)
}
@@ -136,7 +136,7 @@ impl ImageBoxInfo {
// TODO: This could probably go somewhere else
pub fn image_height(&self, base: &Box) -> Au {
let attr_height: Option<int> = do base.node.with_imm_element |elt| {
- match elt.get_attr("height") {
+ match elt.get_attr(None, "height") {
Some(height) => {
FromStr::from_str(height)
}
diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs
index 5e9f0e9ffee..8e0c7676ca8 100644
--- a/src/components/script/dom/document.rs
+++ b/src/components/script/dom/document.rs
@@ -296,7 +296,7 @@ impl Document {
pub fn GetElementsByName(&self, name: DOMString) -> @mut HTMLCollection {
self.createHTMLCollection(|elem|
- elem.get_attr("name").is_some() && eq_slice(elem.get_attr("name").unwrap(), name))
+ elem.get_attr(None, "name").is_some() && eq_slice(elem.get_attr(None, "name").unwrap(), name))
}
pub fn createHTMLCollection(&self, callback: &fn(elem: &Element) -> bool) -> @mut HTMLCollection {
@@ -374,7 +374,7 @@ fn foreach_ided_elements(root: &AbstractNode<ScriptView>,
}
do node.with_imm_element |element| {
- match element.get_attr("id") {
+ match element.get_attr(None, "id") {
Some(id) => {
callback(&id.to_str(), &node);
}
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index b5ef23b5031..250afbcc707 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -133,8 +133,8 @@ impl ElementLike for Element {
self.namespace.to_str().unwrap_or("")
}
- fn get_attr(&self, name: &str) -> Option<~str> {
- self.get_attribute(None, name).map(|attr| attr.value.clone())
+ fn get_attr(&self, ns_url: Option<~str>, name: &str) -> Option<~str> {
+ self.get_attribute(ns_url, name).map(|attr| attr.value.clone())
}
fn get_link(&self) -> Option<~str>{
@@ -144,7 +144,7 @@ impl ElementLike for Element {
ElementNodeTypeId(HTMLAnchorElementTypeId) |
ElementNodeTypeId(HTMLAreaElementTypeId) |
ElementNodeTypeId(HTMLLinkElementTypeId)
- => self.get_attr("href"),
+ => self.get_attr(None, "href"),
_ => None,
}
}
@@ -304,7 +304,7 @@ impl Element {
}
pub fn Id(&self, _abstract_self: AbstractNode<ScriptView>) -> DOMString {
- match self.get_attr(&"id") {
+ match self.get_attr(None, "id") {
Some(x) => x,
None => ~""
}
@@ -327,7 +327,7 @@ impl Element {
}
pub fn GetAttribute(&self, name: DOMString) -> Option<DOMString> {
- self.get_attr(name).map(|s| s.to_owned())
+ self.get_attr(None, name).map(|s| s.to_owned())
}
pub fn GetAttributeNS(&self, namespace: Option<DOMString>, local_name: DOMString) -> Option<DOMString> {
diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index 6751d88fe61..cbc937afa84 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -58,7 +58,7 @@ impl HTMLDocument {
pub fn Links(&self) -> @mut HTMLCollection {
self.parent.createHTMLCollection(|elem|
(eq_slice(elem.tag_name, "a") || eq_slice(elem.tag_name, "area"))
- && elem.get_attr("href").is_some())
+ && elem.get_attr(None, "href").is_some())
}
pub fn Forms(&self) -> @mut HTMLCollection {
@@ -71,7 +71,7 @@ impl HTMLDocument {
pub fn Anchors(&self) -> @mut HTMLCollection {
self.parent.createHTMLCollection(|elem|
- eq_slice(elem.tag_name, "a") && elem.get_attr("name").is_some())
+ eq_slice(elem.tag_name, "a") && elem.get_attr(None, "name").is_some())
}
pub fn Applets(&self) -> @mut HTMLCollection {
diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs
index f02c08a9243..2a90a71886d 100644
--- a/src/components/script/dom/htmlimageelement.rs
+++ b/src/components/script/dom/htmlimageelement.rs
@@ -40,7 +40,7 @@ impl HTMLImageElement {
/// prefetching the image. This method must be called after `src` is changed.
pub fn update_image(&mut self, image_cache: ImageCacheTask, url: Option<Url>) {
let elem = &mut self.htmlelement.element;
- let src_opt = elem.get_attr("src").map(|x| x.to_str());
+ let src_opt = elem.get_attr(None, "src").map(|x| x.to_str());
match src_opt {
None => {}
Some(src) => {
diff --git a/src/components/script/dom/htmlscriptelement.rs b/src/components/script/dom/htmlscriptelement.rs
index a6dc92306e1..1ced40c2e66 100644
--- a/src/components/script/dom/htmlscriptelement.rs
+++ b/src/components/script/dom/htmlscriptelement.rs
@@ -29,7 +29,7 @@ impl HTMLScriptElement {
impl HTMLScriptElement {
pub fn Src(&self) -> DOMString {
- match self.htmlelement.element.get_attr("src") {
+ match self.htmlelement.element.get_attr(None, "src") {
Some(s) => s.to_owned(),
None => ~""
}
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 4a12a397ab0..b36e1d60cf2 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -350,7 +350,7 @@ pub fn parse_html(cx: *JSContext,
// Handle CSS style sheets from <link> elements
ElementNodeTypeId(HTMLLinkElementTypeId) => {
do node.with_imm_element |element| {
- match (element.get_attr("rel"), element.get_attr("href")) {
+ match (element.get_attr(None, "rel"), element.get_attr(None, "href")) {
(Some(rel), Some(href)) => {
if "stylesheet" == rel {
debug!("found CSS stylesheet: {:s}", href);
@@ -369,7 +369,7 @@ pub fn parse_html(cx: *JSContext,
let iframe_chan = iframe_chan.take();
let sandboxed = iframe_element.is_sandboxed();
let elem = &mut iframe_element.htmlelement.element;
- let src_opt = elem.get_attr("src").map(|x| x.to_str());
+ let src_opt = elem.get_attr(None, "src").map(|x| x.to_str());
for src in src_opt.iter() {
let iframe_url = make_url(src.clone(), Some(url2.clone()));
iframe_element.frame = Some(iframe_url.clone());
@@ -470,7 +470,7 @@ pub fn parse_html(cx: *JSContext,
unsafe {
let scriptnode: AbstractNode<ScriptView> = NodeWrapping::from_hubbub_node(script);
do scriptnode.with_imm_element |script| {
- match script.get_attr("src") {
+ match script.get_attr(None, "src") {
Some(src) => {
debug!("found script: {:s}", src);
let new_url = make_url(src.to_str(), Some(url3.clone()));
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 63d1fdec2df..35ebeaf69ce 100755
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -802,7 +802,7 @@ impl ScriptTask {
let mut anchors = doc_node.traverse_preorder().filter(|node| node.is_anchor_element());
do anchors.find |node| {
do node.with_imm_element |elem| {
- match elem.get_attr("name") {
+ match elem.get_attr(None, "name") {
Some(name) => eq_slice(name, fragid),
None => false
}
@@ -901,7 +901,7 @@ impl ScriptTask {
fn load_url_from_element(&self, page: @mut Page, element: &Element) {
// if the node's element is "a," load url from href attr
- let attr = element.get_attr("href");
+ let attr = element.get_attr(None, "href");
for href in attr.iter() {
debug!("ScriptTask: clicked on link to {:s}", *href);
let click_frag = href.starts_with("#");
diff --git a/src/components/style/selector_matching.rs b/src/components/style/selector_matching.rs
index 079e1babf83..b91932593dd 100644
--- a/src/components/style/selector_matching.rs
+++ b/src/components/style/selector_matching.rs
@@ -74,13 +74,13 @@ impl SelectorMap {
let init_len = matching_rules_list[list_index].len();
static WHITESPACE: &'static [char] = &'static [' ', '\t', '\n', '\r', '\x0C'];
do node.with_imm_element_like |element: &E| {
- match element.get_attr("id") {
+ match element.get_attr(None, "id") {
Some(id) => SelectorMap::get_matching_rules_from_hash(
node, pseudo_element, &self.id_hash, id, &mut matching_rules_list[list_index]),
None => {}
}
- match element.get_attr("class") {
+ match element.get_attr(None, "class") {
Some(ref class_attr) => {
for class in class_attr.split_iter(WHITESPACE) {
SelectorMap::get_matching_rules_from_hash(
@@ -434,7 +434,7 @@ fn matches_simple_selector<N: TreeNode<T>, T: TreeNodeRefAsElement<N, E>, E: Ele
// TODO: cache and intern IDs on elements.
IDSelector(ref id) => {
do element.with_imm_element_like |element: &E| {
- match element.get_attr("id") {
+ match element.get_attr(None, "id") {
Some(attr) => str::eq_slice(attr, *id),
None => false
}
@@ -443,7 +443,7 @@ fn matches_simple_selector<N: TreeNode<T>, T: TreeNodeRefAsElement<N, E>, E: Ele
// TODO: cache and intern classe names on elements.
ClassSelector(ref class) => {
do element.with_imm_element_like |element: &E| {
- match element.get_attr("class") {
+ match element.get_attr(None, "class") {
None => false,
// TODO: case-sensitivity depends on the document type and quirks mode
Some(ref class_attr)
@@ -642,12 +642,10 @@ fn matches_last_child<N: TreeNode<T>, T: TreeNodeRefAsElement<N, E>, E: ElementL
fn match_attribute<N: TreeNode<T>, T: TreeNodeRefAsElement<N, E>, E: ElementLike>(
attr: &AttrSelector, element: &T, f: &fn(&str)-> bool) -> bool {
do element.with_imm_element_like |element: &E| {
- match attr.namespace {
- Some(_) => false, // TODO, when the DOM supports namespaces on attributes
- None => match element.get_attr(attr.name) {
- None => false,
- Some(ref value) => f(value.as_slice())
- }
+ // FIXME: avoid .clone() here? See #1367
+ match element.get_attr(attr.namespace.clone(), attr.name) {
+ None => false,
+ Some(value) => f(value)
}
}
}
diff --git a/src/components/util/tree.rs b/src/components/util/tree.rs
index 0f32bd7d469..64c26a2d4ea 100644
--- a/src/components/util/tree.rs
+++ b/src/components/util/tree.rs
@@ -349,6 +349,6 @@ pub trait TreeNode<Ref: TreeNodeRef<Self>> {
pub trait ElementLike {
fn get_local_name<'a>(&'a self) -> &'a str;
fn get_namespace_url<'a>(&'a self) -> &'a str;
- fn get_attr(&self, name: &str) -> Option<~str>;
+ fn get_attr(&self, ns_url: Option<~str>, name: &str) -> Option<~str>;
fn get_link(&self) -> Option<~str>;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 20:38:21 +0000