4 files changed, 33 insertions, 7 deletions
diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
index 335a5a66823..0fba6875d2f 100644
--- a/components/layout/display_list/builder.rs
+++ b/components/layout/display_list/builder.rs
@@ -13,6 +13,7 @@ use std::sync::Arc;
 use std::{f32, mem};
 
 use app_units::{Au, AU_PER_PX};
+use base::id::{BrowsingContextId, PipelineId};
 use bitflags::bitflags;
 use canvas_traits::canvas::{CanvasMsg, FromLayoutMsg};
 use embedder_traits::Cursor;
@@ -21,12 +22,11 @@ use euclid::{rect, SideOffsets2D};
 use fnv::FnvHashMap;
 use gfx::text::glyph::ByteIndex;
 use gfx::text::TextRun;
-use gfx_traits::{combine_id_with_fragment_type, FragmentType, StackingContextId};
 use ipc_channel::ipc;
 use log::{debug, warn};
-use msg::constellation_msg::{BrowsingContextId, PipelineId};
 use net_traits::image_cache::UsePlaceholder;
 use range::Range;
+use script_layout_interface::{combine_id_with_fragment_type, FragmentType};
 use script_traits::compositor::ScrollSensitivity;
 use servo_config::opts;
 use servo_geometry::{self, MaxRect};
@@ -53,6 +53,7 @@ use webrender_api::{
     NinePatchBorderSource, NormalBorder, PropertyBinding, StickyOffsetBounds,
 };
 
+use super::StackingContextId;
 use crate::block::BlockFlow;
 use crate::context::LayoutContext;
 use crate::display_list::background::{self, get_cyclic};
diff --git a/components/layout/display_list/items.rs b/components/layout/display_list/items.rs
index 193a9f6c461..6fe14f03143 100644
--- a/components/layout/display_list/items.rs
+++ b/components/layout/display_list/items.rs
@@ -16,11 +16,10 @@ use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::{f32, fmt};
 
+use base::id::PipelineId;
+use base::print_tree::PrintTree;
 use embedder_traits::Cursor;
 use euclid::{SideOffsets2D, Vector2D};
-use gfx_traits::print_tree::PrintTree;
-use gfx_traits::{self, StackingContextId};
-use msg::constellation_msg::PipelineId;
 use net_traits::image::base::Image;
 use script_traits::compositor::{ScrollSensitivity, ScrollTreeNodeId};
 use serde::Serialize;
@@ -35,6 +34,8 @@ use webrender_api::{
     SpatialId, StickyOffsetBounds, TransformStyle,
 };
 
+use super::StackingContextId;
+
 /// The factor that we multiply the blur radius by in order to inflate the boundaries of display
 /// items that involve a blur. This ensures that the display item boundaries include all the ink.
 pub static BLUR_INFLATION_FACTOR: i32 = 3;
diff --git a/components/layout/display_list/mod.rs b/components/layout/display_list/mod.rs
index aa6d3d2f500..ccd7763144f 100644
--- a/components/layout/display_list/mod.rs
+++ b/components/layout/display_list/mod.rs
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use malloc_size_of_derive::MallocSizeOf;
+use serde::{Deserialize, Serialize};
+
 pub use self::builder::{
     BorderPaintingMode, DisplayListBuildState, IndexableText, StackingContextCollectionFlags,
     StackingContextCollectionState,
@@ -15,3 +18,24 @@ pub(crate) mod conversions;
 mod gradient;
 pub mod items;
 mod webrender_helpers;
+
+/// A unique ID for every stacking context.
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, MallocSizeOf, PartialEq, Serialize)]
+pub struct StackingContextId(
+    /// The identifier for this StackingContext, derived from the Flow's memory address
+    /// and fragment type.  As a space optimization, these are combined into a single word.
+    pub u64,
+);
+
+impl StackingContextId {
+    /// Returns the stacking context ID for the outer document/layout root.
+    #[inline]
+    pub fn root() -> StackingContextId {
+        StackingContextId(0)
+    }
+
+    pub fn next(&self) -> StackingContextId {
+        let StackingContextId(id) = *self;
+        StackingContextId(id + 1)
+    }
+}
diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs
index 85c3694b98d..0ac79b4d8ca 100644
--- a/components/layout/display_list/webrender_helpers.rs
+++ b/components/layout/display_list/webrender_helpers.rs
@@ -7,9 +7,9 @@
 //           This might be achieved by sharing types between WR and Servo display lists, or
 //           completely converting layout to directly generate WebRender display lists, for example.
 
-use gfx_traits::WebRenderEpochToU16;
+use base::id::PipelineId;
+use base::WebRenderEpochToU16;
 use log::trace;
-use msg::constellation_msg::PipelineId;
 use script_traits::compositor::{
     CompositorDisplayListInfo, ScrollSensitivity, ScrollTreeNodeId, ScrollableNodeInfo,
 };