Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make LayoutHTMLImageElementHelpers methods take self

Browse source
This commit is contained in:
Anthony Ramine 2020-03-29 17:20:40 +02:00
parent 1504f35031
commit e590251e5f
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/script/dom/htmlimageelement.rs
View file

@ -1367,24 +1367,20 @@ impl MicrotaskRunnable for ImageElementMicrotask {
pub trait LayoutHTMLImageElementHelpers { pub trait LayoutHTMLImageElementHelpers {
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn image(&self) -> Option<Arc<Image>>; unsafe fn image(self) -> Option<Arc<Image>>;
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn image_url(&self) -> Option<ServoUrl>; unsafe fn image_url(self) -> Option<ServoUrl>;
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn image_density(&self) -> Option<f64>; unsafe fn image_density(self) -> Option<f64>;
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn image_data(&self) -> (Option<Arc<Image>>, Option<ImageMetadata>); unsafe fn image_data(self) -> (Option<Arc<Image>>, Option<ImageMetadata>);
fn get_width(self) -> LengthOrPercentageOrAuto;
fn get_width(&self) -> LengthOrPercentageOrAuto; fn get_height(self) -> LengthOrPercentageOrAuto;
fn get_height(&self) -> LengthOrPercentageOrAuto;
} }
impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> { impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> {
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn image(&self) -> Option<Arc<Image>> { unsafe fn image(self) -> Option<Arc<Image>> {
(*self.unsafe_get()) (*self.unsafe_get())
.current_request .current_request
.borrow_for_layout() .borrow_for_layout()
@ -1393,7 +1389,7 @@ impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> {
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn image_url(&self) -> Option<ServoUrl> { unsafe fn image_url(self) -> Option<ServoUrl> {
(*self.unsafe_get()) (*self.unsafe_get())
.current_request .current_request
.borrow_for_layout() .borrow_for_layout()
@ -1402,7 +1398,7 @@ impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> {
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn image_data(&self) -> (Option<Arc<Image>>, Option<ImageMetadata>) { unsafe fn image_data(self) -> (Option<Arc<Image>>, Option<ImageMetadata>) {
let current_request = (*self.unsafe_get()).current_request.borrow_for_layout(); let current_request = (*self.unsafe_get()).current_request.borrow_for_layout();
( (
current_request.image.clone(), current_request.image.clone(),
@ -1411,7 +1407,7 @@ impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> {
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn image_density(&self) -> Option<f64> { unsafe fn image_density(self) -> Option<f64> {
(*self.unsafe_get()) (*self.unsafe_get())
.current_request .current_request
.borrow_for_layout() .borrow_for_layout()
@ -1420,7 +1416,7 @@ impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> {
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn get_width(&self) -> LengthOrPercentageOrAuto { fn get_width(self) -> LengthOrPercentageOrAuto {
unsafe { unsafe {
(*self.upcast::<Element>().unsafe_get()) (*self.upcast::<Element>().unsafe_get())
.get_attr_for_layout(&ns!(), &local_name!("width")) .get_attr_for_layout(&ns!(), &local_name!("width"))
@ -1431,7 +1427,7 @@ impl LayoutHTMLImageElementHelpers for LayoutDom<'_, HTMLImageElement> {
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn get_height(&self) -> LengthOrPercentageOrAuto { fn get_height(self) -> LengthOrPercentageOrAuto {
unsafe { unsafe {
(*self.upcast::<Element>().unsafe_get()) (*self.upcast::<Element>().unsafe_get())
.get_attr_for_layout(&ns!(), &local_name!("height")) .get_attr_for_layout(&ns!(), &local_name!("height"))