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

move struct ImageMetadata to a better place

Browse source
This commit is contained in:
Kosov Eugene 2016-05-09 00:44:49 +03:00
parent 47c2858647
commit d51c61481f
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/msg/constellation_msg.rs
View file

@ -220,12 +220,6 @@ pub enum PixelFormat {
RGBA8, // RGB + alpha, 8 bits per channel
}
#[derive(Clone, Deserialize, Eq, PartialEq, Serialize, HeapSizeOf)]
pub struct ImageMetadata {
pub width: u32,
pub height: u32,
}
#[derive(Clone, Deserialize, Serialize, HeapSizeOf)]
pub struct Image {
pub width: u32,

8
components/net_traits/image/base.rs
View file

@ -6,7 +6,13 @@ use ipc_channel::ipc::IpcSharedMemory;
use piston_image::{self, DynamicImage, GenericImage, ImageFormat};
use util::opts;
pub use msg::constellation_msg::{Image, ImageMetadata, PixelFormat};
pub use msg::constellation_msg::{Image, PixelFormat};
#[derive(Clone, Deserialize, Eq, PartialEq, Serialize, HeapSizeOf)]
pub struct ImageMetadata {
pub width: u32,
pub height: u32,
}
// FIXME: Images must not be copied every frame. Instead we should atomically
// reference count them.

3
components/net_traits/image_cache_thread.rs
View file

@ -2,8 +2,9 @@
* 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 image::base::ImageMetadata;
use ipc_channel::ipc::{self, IpcSender};
use msg::constellation_msg::{Image, ImageMetadata};
use msg::constellation_msg::Image;
use std::sync::Arc;
use url::Url;