Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Current-pixel-density tests passing

Browse source
This commit is contained in:
paavininanda 2018-09-03 19:46:15 +05:30
parent 9a83ab6297
commit 25027e476c
9 changed files with 74 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/construct.rs
View file

@ -400,6 +400,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
Some(LayoutNodeType::Element(LayoutElementType::HTMLImageElement)) => {
let image_info = Box::new(ImageFragmentInfo::new(
node.image_url(),
node.image_density(),
node,
&self.layout_context,
));
@ -408,6 +409,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
Some(LayoutNodeType::Element(LayoutElementType::HTMLObjectElement)) => {
let image_info = Box::new(ImageFragmentInfo::new(
node.object_data(),
None,
node,
&self.layout_context,
));
@ -1471,6 +1473,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
ImageUrlOrNone::Url(ref url_value) => {
let image_info = Box::new(ImageFragmentInfo::new(
url_value.url().map(|u| u.clone()),
None,
node,
&self.layout_context,
));

35
components/layout/fragment.rs
View file

@ -393,6 +393,7 @@ impl ImageFragmentInfo {
/// sense to me.
pub fn new<N: ThreadSafeLayoutNode>(
url: Option<ServoUrl>,
density: Option<f64>,
node: &N,
layout_context: &LayoutContext,
) -> ImageFragmentInfo {
@ -400,15 +401,33 @@ impl ImageFragmentInfo {
layout_context.get_or_request_image_or_meta(node.opaque(), url, UsePlaceholder::Yes)
});
let current_pixel_density = density.unwrap_or(1f64);
let (image, metadata) = match image_or_metadata {
Some(ImageOrMetadataAvailable::ImageAvailable(i, _)) => (
Some(i.clone()),
Some(ImageMetadata {
height: i.height,
width: i.width,
}),
),
Some(ImageOrMetadataAvailable::MetadataAvailable(m)) => (None, Some(m)),
Some(ImageOrMetadataAvailable::ImageAvailable(i, _)) => {
let height = (i.height as f64 / current_pixel_density) as u32;
let width = (i.width as f64 / current_pixel_density) as u32;
(
Some(Arc::new(Image {
height: height,
width: width,
..(*i).clone()
})),
Some(ImageMetadata {
height: height,
width: width,
}),
)
},
Some(ImageOrMetadataAvailable::MetadataAvailable(m)) => {
(
None,
Some(ImageMetadata {
height: (m.height as f64 / current_pixel_density) as u32,
width: (m.width as f64 / current_pixel_density) as u32,
}),
)
},
None => (None, None),
};