3 files changed, 7 insertions, 7 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index 273a1446a75..2becf6a5675 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -20,7 +20,7 @@ gfx = {path = "../gfx"}
 gfx_traits = {path = "../gfx_traits"}
 heapsize = "0.4"
 html5ever = "0.20.0"
-ipc-channel = "0.8"
+ipc-channel = "0.9"
 libc = "0.2"
 log = "0.3.5"
 msg = {path = "../msg"}
diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index 522766b5f6d..f29a1f377ae 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -28,7 +28,7 @@ use gfx::display_list::{BorderRadii, BoxShadowClipMode, BoxShadowDisplayItem, Cl
 use gfx::display_list::{ClipScrollNodeType, ClippingRegion, DisplayItem, DisplayItemMetadata};
 use gfx::display_list::{DisplayList, DisplayListSection, GradientDisplayItem, IframeDisplayItem};
 use gfx::display_list::{ImageBorder, ImageDisplayItem, LineDisplayItem, NormalBorder, OpaqueNode};
-use gfx::display_list::{PopTextShadowDisplayItem, PushTextShadowDisplayItem};
+use gfx::display_list::{PopAllTextShadowsDisplayItem, PushTextShadowDisplayItem};
 use gfx::display_list::{RadialGradientDisplayItem, SolidColorDisplayItem, StackingContext};
 use gfx::display_list::{StackingContextType, TextDisplayItem, TextOrientation, WebRenderImageInfo};
 use gfx_traits::{combine_id_with_fragment_type, FragmentType, StackingContextId};
@@ -2340,9 +2340,9 @@ impl FragmentDisplayListBuilding for Fragment {
             );
         }
 
-        // Pair all the PushTextShadows
-        for _ in text_shadows {
-            state.add_display_item(DisplayItem::PopTextShadow(Box::new(PopTextShadowDisplayItem {
+        // Pop all the PushTextShadows
+        if !text_shadows.is_empty() {
+            state.add_display_item(DisplayItem::PopAllTextShadows(Box::new(PopAllTextShadowsDisplayItem {
                 base: base.clone(),
             })));
         }
diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs
index 8f86477e980..fbd5d423ddf 100644
--- a/components/layout/webrender_helpers.rs
+++ b/components/layout/webrender_helpers.rs
@@ -465,8 +465,8 @@ impl WebRenderDisplayItemConverter for DisplayItem {
                                         color: item.color,
                                     });
             }
-            DisplayItem::PopTextShadow(_) => {
-                builder.pop_shadow();
+            DisplayItem::PopAllTextShadows(_) => {
+                builder.pop_all_shadows();
             }
             DisplayItem::Iframe(ref item) => {
                 let rect = item.base.bounds;