From a5115139baca2d2a15831916d83964a4d374fae1 Mon Sep 17 00:00:00 2001 From: Pyfisch Date: Sat, 10 Feb 2018 22:17:28 +0100 Subject: [PATCH] Remove image_data field from display item It was unused. --- components/gfx/display_list/mod.rs | 4 ---- components/layout/display_list/builder.rs | 3 --- 2 files changed, 7 deletions(-) diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index bc2cad8782b3..a5d7118364ef 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -18,7 +18,6 @@ use euclid::{Vector2D, TypedRect, SideOffsets2D}; use euclid::num::{One, Zero}; use gfx_traits::{self, StackingContextId}; use gfx_traits::print_tree::PrintTree; -use ipc_channel::ipc::IpcSharedMemory; use msg::constellation_msg::PipelineId; use net_traits::image::base::{Image, PixelFormat}; use range::Range; @@ -683,9 +682,6 @@ pub struct ImageDisplayItem { pub webrender_image: WebRenderImageInfo, - #[ignore_malloc_size_of = "Because it is non-owning"] - pub image_data: Option>, - /// The dimensions to which the image display item should be stretched. If this is smaller than /// the bounds of this display item, then the image will be repeated in the appropriate /// direction to tile the entire bounds. diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs index a8853648b235..15a03050e41b 100644 --- a/components/layout/display_list/builder.rs +++ b/components/layout/display_list/builder.rs @@ -1203,7 +1203,6 @@ impl FragmentDisplayListBuilding for Fragment { state.add_display_item(DisplayItem::Image(Box::new(ImageDisplayItem { base: base, webrender_image: webrender_image, - image_data: None, stretch_size: placement.tile_size.to_layout(), tile_spacing: placement.tile_spacing.to_layout(), image_rendering: style.get_inheritedbox().image_rendering.to_layout(), @@ -2000,7 +1999,6 @@ impl FragmentDisplayListBuilding for Fragment { state.add_display_item(DisplayItem::Image(Box::new(ImageDisplayItem { base: base, webrender_image: WebRenderImageInfo::from_image(image), - image_data: Some(Arc::new(image.bytes.clone())), stretch_size: stacking_relative_content_box.size.to_layout(), tile_spacing: LayoutSize::zero(), image_rendering: self.style.get_inheritedbox().image_rendering.to_layout(), @@ -2041,7 +2039,6 @@ impl FragmentDisplayListBuilding for Fragment { format: format, key: Some(image_key), }, - image_data: None, stretch_size: stacking_relative_content_box.size.to_layout(), tile_spacing: LayoutSize::zero(), image_rendering: ImageRendering::Auto,