7762f4620e
<!-- Please describe your changes on the following line: --> I just changed the `prefix` parameters on the constructors of several HTML elements. The type now is `Option<Prefix>`. I also changed the sizes of the `sizeof.rs` unit test to match the new values. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #16700 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because it should not affect anything else <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: ed7686b42c02c5c1d769be952ef58b285f35a7f6
85 lines
2.9 KiB
Rust
85 lines
2.9 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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 dom::attr::Attr;
|
|
use dom::bindings::codegen::Bindings::SVGSVGElementBinding;
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::js::{LayoutJS, Root};
|
|
use dom::bindings::str::DOMString;
|
|
use dom::document::Document;
|
|
use dom::element::{AttributeMutation, Element, RawLayoutElementHelpers};
|
|
use dom::node::Node;
|
|
use dom::svggraphicselement::SVGGraphicsElement;
|
|
use dom::virtualmethods::VirtualMethods;
|
|
use dom_struct::dom_struct;
|
|
use html5ever::{LocalName, Prefix};
|
|
use script_layout_interface::SVGSVGData;
|
|
use style::attr::AttrValue;
|
|
|
|
const DEFAULT_WIDTH: u32 = 300;
|
|
const DEFAULT_HEIGHT: u32 = 150;
|
|
|
|
#[dom_struct]
|
|
pub struct SVGSVGElement {
|
|
svggraphicselement: SVGGraphicsElement
|
|
}
|
|
|
|
impl SVGSVGElement {
|
|
fn new_inherited(local_name: LocalName,
|
|
prefix: Option<Prefix>,
|
|
document: &Document) -> SVGSVGElement {
|
|
SVGSVGElement {
|
|
svggraphicselement:
|
|
SVGGraphicsElement::new_inherited(local_name, prefix, document)
|
|
}
|
|
}
|
|
|
|
#[allow(unrooted_must_root)]
|
|
pub fn new(local_name: LocalName,
|
|
prefix: Option<Prefix>,
|
|
document: &Document) -> Root<SVGSVGElement> {
|
|
Node::reflect_node(box SVGSVGElement::new_inherited(local_name, prefix, document),
|
|
document,
|
|
SVGSVGElementBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
pub trait LayoutSVGSVGElementHelpers {
|
|
fn data(&self) -> SVGSVGData;
|
|
}
|
|
|
|
impl LayoutSVGSVGElementHelpers for LayoutJS<SVGSVGElement> {
|
|
#[allow(unsafe_code)]
|
|
fn data(&self) -> SVGSVGData {
|
|
unsafe {
|
|
let SVG = &*self.unsafe_get();
|
|
|
|
let width_attr = SVG.upcast::<Element>().get_attr_for_layout(&ns!(), &local_name!("width"));
|
|
let height_attr = SVG.upcast::<Element>().get_attr_for_layout(&ns!(), &local_name!("height"));
|
|
SVGSVGData {
|
|
width: width_attr.map_or(DEFAULT_WIDTH, |val| val.as_uint()),
|
|
height: height_attr.map_or(DEFAULT_HEIGHT, |val| val.as_uint()),
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
impl VirtualMethods for SVGSVGElement {
|
|
fn super_type(&self) -> Option<&VirtualMethods> {
|
|
Some(self.upcast::<SVGGraphicsElement>() as &VirtualMethods)
|
|
}
|
|
|
|
fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
|
|
self.super_type().unwrap().attribute_mutated(attr, mutation);
|
|
}
|
|
|
|
fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
|
|
match name {
|
|
&local_name!("width") => AttrValue::from_u32(value.into(), DEFAULT_WIDTH),
|
|
&local_name!("height") => AttrValue::from_u32(value.into(), DEFAULT_HEIGHT),
|
|
_ => self.super_type().unwrap().parse_plain_attribute(name, value),
|
|
}
|
|
}
|
|
}
|