From 034feafa8cb1c9c0888e6e48ea518bbd1e5a2db8 Mon Sep 17 00:00:00 2001
From: Glenn Watson <github@intuitionlibrary.com>
Date: Wed, 8 Mar 2017 12:45:27 +1000
Subject: [PATCH] Update WR (types updates, stacking context culling)

---
 Cargo.lock                             |  4 ++--
 components/compositing/compositor.rs   | 18 +-----------------
 components/layout/webrender_helpers.rs | 18 +-----------------
 components/servo/lib.rs                |  5 +++--
 4 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cd0be7a0e46..d6198007229 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3175,7 +3175,7 @@ dependencies = [
 [[package]]
 name = "webrender"
 version = "0.22.1"
-source = "git+https://github.com/servo/webrender#f9860e08a22e9753974fbb7f34dbf675b2891b59"
+source = "git+https://github.com/servo/webrender#ec377923dd3ccc67b26ae5dfeb04c87af42ede06"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bincode 1.0.0-alpha2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3203,7 +3203,7 @@ dependencies = [
 [[package]]
 name = "webrender_traits"
 version = "0.23.1"
-source = "git+https://github.com/servo/webrender#f9860e08a22e9753974fbb7f34dbf675b2891b59"
+source = "git+https://github.com/servo/webrender#ec377923dd3ccc67b26ae5dfeb04c87af42ede06"
 dependencies = [
  "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index a4061351939..12f742e12b9 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -12,7 +12,7 @@ use euclid::point::TypedPoint2D;
 use euclid::rect::TypedRect;
 use euclid::scale_factor::ScaleFactor;
 use euclid::size::TypedSize2D;
-use gfx_traits::{Epoch, FragmentType, ScrollRootId};
+use gfx_traits::{Epoch, ScrollRootId};
 use gleam::gl;
 use gleam::gl::types::{GLint, GLsizei};
 use image::{DynamicImage, ImageFormat, RgbImage};
@@ -83,22 +83,6 @@ impl ConvertScrollRootIdFromWebRender for webrender_traits::ServoScrollRootId {
     }
 }
 
-trait ConvertFragmentTypeFromWebRender {
-    fn from_webrender(&self) -> FragmentType;
-}
-
-impl ConvertFragmentTypeFromWebRender for webrender_traits::FragmentType {
-    fn from_webrender(&self) -> FragmentType {
-        match *self {
-            webrender_traits::FragmentType::FragmentBody => FragmentType::FragmentBody,
-            webrender_traits::FragmentType::BeforePseudoContent => {
-                FragmentType::BeforePseudoContent
-            }
-            webrender_traits::FragmentType::AfterPseudoContent => FragmentType::AfterPseudoContent,
-        }
-    }
-}
-
 /// Holds the state when running reftests that determines when it is
 /// safe to save the output image.
 #[derive(Copy, Clone, PartialEq)]
diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs
index d7a3d8c8710..1a8b33e5e4a 100644
--- a/components/layout/webrender_helpers.rs
+++ b/components/layout/webrender_helpers.rs
@@ -11,7 +11,7 @@ use app_units::Au;
 use euclid::{Point2D, Rect, SideOffsets2D, Size2D};
 use gfx::display_list::{BorderDetails, BorderRadii, BoxShadowClipMode, ClippingRegion};
 use gfx::display_list::{DisplayItem, DisplayList, DisplayListTraversal, StackingContextType};
-use gfx_traits::{FragmentType, ScrollRootId};
+use gfx_traits::ScrollRootId;
 use msg::constellation_msg::PipelineId;
 use style::computed_values::{image_rendering, mix_blend_mode};
 use style::computed_values::filter::{self, Filter};
@@ -421,19 +421,3 @@ impl WebRenderScrollRootIdConverter for ScrollRootId {
         webrender_traits::ServoScrollRootId(self.0)
     }
 }
-
-trait WebRenderFragmentTypeConverter {
-    fn convert_to_webrender(&self) -> webrender_traits::FragmentType;
-}
-
-impl WebRenderFragmentTypeConverter for FragmentType {
-    fn convert_to_webrender(&self) -> webrender_traits::FragmentType {
-        match *self {
-            FragmentType::FragmentBody => webrender_traits::FragmentType::FragmentBody,
-            FragmentType::BeforePseudoContent => {
-                webrender_traits::FragmentType::BeforePseudoContent
-            }
-            FragmentType::AfterPseudoContent => webrender_traits::FragmentType::AfterPseudoContent,
-        }
-    }
-}
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 40ffba9eb8d..5d9ffcd0eb8 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -99,6 +99,7 @@ use std::cmp::max;
 use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::mpsc::Sender;
+use webrender::renderer::RendererKind;
 use webvr::{WebVRThread, WebVRCompositorHandler};
 
 pub use gleam::gl;
@@ -159,9 +160,9 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
             };
 
             let renderer_kind = if opts::get().should_use_osmesa() {
-                webrender_traits::RendererKind::OSMesa
+                RendererKind::OSMesa
             } else {
-                webrender_traits::RendererKind::Native
+                RendererKind::Native
             };
 
             let recorder = if opts.webrender_record {