From a74688b992c22e7d33734cefde6124b3f33c35d4 Mon Sep 17 00:00:00 2001
From: Pyfisch <pyfisch@gmail.com>
Date: Sun, 7 Jan 2018 23:13:41 +0100
Subject: [PATCH] Remove BoxShadowClipMode from gfx

---
 components/gfx/display_list/mod.rs              | 16 +++-------------
 components/layout/display_list/builder.rs       |  4 ++--
 .../layout/display_list/webrender_helpers.rs    | 17 ++---------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs
index 6c3df102817..c4c73e50dc7 100644
--- a/components/gfx/display_list/mod.rs
+++ b/components/gfx/display_list/mod.rs
@@ -33,8 +33,8 @@ use style::values::computed::Filter;
 use style_traits::cursor::Cursor;
 use text::TextRun;
 use text::glyph::ByteIndex;
-use webrender_api::{self, ClipId, ColorF, GradientStop, LocalClip, MixBlendMode, ScrollPolicy};
-use webrender_api::{ScrollSensitivity, StickyOffsetBounds, TransformStyle};
+use webrender_api::{self, BoxShadowClipMode, ClipId, ColorF, GradientStop, LocalClip, MixBlendMode};
+use webrender_api::{ScrollPolicy, ScrollSensitivity, StickyOffsetBounds, TransformStyle};
 
 pub use style::dom::OpaqueNode;
 
@@ -944,6 +944,7 @@ pub struct BoxShadowDisplayItem {
     pub border_radius: BorderRadii<Au>,
 
     /// How we should clip the result.
+    #[ignore_malloc_size_of = "enum type in webrender"]
     pub clip_mode: BoxShadowClipMode,
 }
 
@@ -998,17 +999,6 @@ pub struct DefineClipScrollNodeItem {
     pub node_index: ClipScrollNodeIndex,
 }
 
-/// How a box shadow should be clipped.
-#[derive(Clone, Copy, Debug, Deserialize, MallocSizeOf, PartialEq, Serialize)]
-pub enum BoxShadowClipMode {
-    /// The area inside `box_bounds` should be clipped out. Corresponds to the normal CSS
-    /// `box-shadow`.
-    Outset,
-    /// The area outside `box_bounds` should be clipped out. Corresponds to the `inset` flag on CSS
-    /// `box-shadow`.
-    Inset,
-}
-
 impl DisplayItem {
     pub fn base(&self) -> &BaseDisplayItem {
         match *self {
diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
index fd54608ab77..780ca9e9607 100644
--- a/components/layout/display_list/builder.rs
+++ b/components/layout/display_list/builder.rs
@@ -27,7 +27,7 @@ use fragment::{CanvasFragmentSource, CoordinateSystem, Fragment, ScannedTextFrag
 use fragment::SpecificFragmentInfo;
 use gfx::display_list;
 use gfx::display_list::{BaseDisplayItem, BorderDetails, BorderDisplayItem, BLUR_INFLATION_FACTOR};
-use gfx::display_list::{BorderRadii, BoxShadowClipMode, BoxShadowDisplayItem, ClipScrollNode};
+use gfx::display_list::{BorderRadii, BoxShadowDisplayItem, ClipScrollNode};
 use gfx::display_list::{ClipScrollNodeIndex, ClipScrollNodeType, ClippingAndScrolling};
 use gfx::display_list::{ClippingRegion, DisplayItem, DisplayItemMetadata, DisplayList};
 use gfx::display_list::{DisplayListSection, GradientDisplayItem, IframeDisplayItem, ImageBorder};
@@ -77,7 +77,7 @@ use style_traits::CSSPixel;
 use style_traits::ToCss;
 use style_traits::cursor::Cursor;
 use table_cell::CollapsedBordersForCell;
-use webrender_api::{ClipId, ClipMode, ColorF, ComplexClipRegion, LineStyle};
+use webrender_api::{BoxShadowClipMode, ClipId, ClipMode, ColorF, ComplexClipRegion, LineStyle};
 use webrender_api::{LocalClip, RepeatMode, ScrollPolicy, ScrollSensitivity, StickyOffsetBounds};
 
 trait ResolvePercentage {
diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs
index a9ed676ffc8..4bd6d21c1a8 100644
--- a/components/layout/display_list/webrender_helpers.rs
+++ b/components/layout/display_list/webrender_helpers.rs
@@ -10,7 +10,7 @@
 use app_units::Au;
 use display_list::ToLayout;
 use euclid::Point2D;
-use gfx::display_list::{BorderDetails, BorderRadii, BoxShadowClipMode, ClipScrollNode};
+use gfx::display_list::{BorderDetails, BorderRadii, ClipScrollNode};
 use gfx::display_list::{ClipScrollNodeIndex, ClipScrollNodeType, ClippingRegion, DisplayItem};
 use gfx::display_list::{DisplayList, StackingContextType};
 use msg::constellation_msg::PipelineId;
@@ -32,19 +32,6 @@ trait WebRenderDisplayItemConverter {
     );
 }
 
-trait ToBoxShadowClipMode {
-    fn to_clip_mode(&self) -> webrender_api::BoxShadowClipMode;
-}
-
-impl ToBoxShadowClipMode for BoxShadowClipMode {
-    fn to_clip_mode(&self) -> webrender_api::BoxShadowClipMode {
-        match *self {
-            BoxShadowClipMode::Inset => webrender_api::BoxShadowClipMode::Inset,
-            BoxShadowClipMode::Outset => webrender_api::BoxShadowClipMode::Outset,
-        }
-    }
-}
-
 pub trait ToBorderRadius {
     fn to_border_radius(&self) -> webrender_api::BorderRadius;
 }
@@ -331,7 +318,7 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                     item.blur_radius.to_f32_px(),
                     item.spread_radius.to_f32_px(),
                     item.border_radius.to_border_radius(),
-                    item.clip_mode.to_clip_mode(),
+                    item.clip_mode,
                 );
             },
             DisplayItem::PushTextShadow(ref item) => {