mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Handle null strings in Namespace::new.
This also avoids a string copy in the rare case of an unrecognized namespace.
This commit is contained in:
parent
4546d5d23c
commit
d3d7c1dabd
5 changed files with 21 additions and 24 deletions
|
@ -2,6 +2,8 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use str::DOMString;
|
||||
|
||||
#[deriving(Eq, PartialEq, Clone, Encodable, Hash, Show)]
|
||||
pub enum Namespace {
|
||||
Null,
|
||||
|
@ -16,16 +18,17 @@ pub enum Namespace {
|
|||
|
||||
impl Namespace {
|
||||
/// Empty string for "no namespace"
|
||||
pub fn from_str(url: &str) -> Namespace {
|
||||
pub fn from_str(url: Option<DOMString>) -> Namespace {
|
||||
match url {
|
||||
"http://www.w3.org/1999/xhtml" => HTML,
|
||||
"http://www.w3.org/XML/1998/namespace" => XML,
|
||||
"http://www.w3.org/2000/xmlns/" => XMLNS,
|
||||
"http://www.w3.org/1999/xlink" => XLink,
|
||||
"http://www.w3.org/2000/svg" => SVG,
|
||||
"http://www.w3.org/1998/Math/MathML" => MathML,
|
||||
"" => Null,
|
||||
ns => Other(ns.to_string())
|
||||
None => Null,
|
||||
Some(ref ns) if ns.as_slice() == "" => Null,
|
||||
Some(ref ns) if ns.as_slice() == "http://www.w3.org/1999/xhtml" => HTML,
|
||||
Some(ref ns) if ns.as_slice() == "http://www.w3.org/XML/1998/namespace" => XML,
|
||||
Some(ref ns) if ns.as_slice() == "http://www.w3.org/2000/xmlns/" => XMLNS,
|
||||
Some(ref ns) if ns.as_slice() == "http://www.w3.org/1999/xlink" => XLink,
|
||||
Some(ref ns) if ns.as_slice() == "http://www.w3.org/2000/svg" => SVG,
|
||||
Some(ref ns) if ns.as_slice() == "http://www.w3.org/1998/Math/MathML" => MathML,
|
||||
Some(ns) => Other(ns)
|
||||
}
|
||||
}
|
||||
pub fn to_str<'a>(&'a self) -> &'a str {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue