Update webrender.

servo · bors-servo · Jan 18, 2019 · Jan 3, 2019 · Jan 10, 2019 · Jan 11, 2019
commit 9f855ae8473c225ee007d4e5be74268d643c4d2e
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
@@ -63,5 +63,5 @@ servo-fontconfig = "0.2.1"
 xml5ever = {version = "0.12"}
 
 [target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.6"
+dwrote = "0.7"
 truetype = "0.26"
diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs
diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs
@@ -859,8 +859,6 @@ malloc_size_of_is_0!(webrender_api::BorderStyle);
 #[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::BoxShadowClipMode);
 #[cfg(feature = "webrender_api")]
-malloc_size_of_is_0!(webrender_api::ClipAndScrollInfo);
-#[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ColorF);
 #[cfg(feature = "webrender_api")]
 malloc_size_of_is_0!(webrender_api::ComplexClipRegion);

diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs
@@ -122,16 +122,16 @@ impl PipelineId {
         }
     }
 
-    pub fn root_scroll_node(&self) -> webrender_api::ClipId {
-        webrender_api::ClipId::root_scroll_node(self.to_webrender())
+    pub fn root_scroll_node(&self) -> webrender_api::SpatialId {
+        webrender_api::SpatialId::root_scroll_node(self.to_webrender())
     }
 
     pub fn root_scroll_id(&self) -> webrender_api::ExternalScrollId {
         webrender_api::ExternalScrollId(0, self.to_webrender())
     }
 
-    pub fn root_clip_and_scroll_info(&self) -> webrender_api::ClipAndScrollInfo {
-        webrender_api::ClipAndScrollInfo::simple(self.root_scroll_node())
+    pub fn root_clip_node(&self) -> webrender_api::ClipId {
+        webrender_api::ClipId::root(self.to_webrender())
     }
 }
 

diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
@@ -20,6 +20,7 @@ googlevr = ["webvr/googlevr"]
 js_backtrace = ["script/js_backtrace"]
 native-bluetooth = ["bluetooth/native-bluetooth"]
 webrender_debugger = ["webrender/debugger"]
+no_static_freetype = ["webrender/no_static_freetype"]
 oculusvr = ["webvr/oculusvr"]
 unstable = [
     "euclid/unstable",

diff --git a/ports/libmlservo/Cargo.toml b/ports/libmlservo/Cargo.toml
@@ -14,7 +14,7 @@ bench = false
 
 [dependencies]
 keyboard-types = "0.4"
-libservo = { path = "../../components/servo" }
+libservo = { path = "../../components/servo", features = ["no_static_freetype"] }
 log = "0.4"
 servo-egl = "0.2"
 smallvec = "0.6"

diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
@@ -36,6 +36,7 @@ energy-profiling = ["libservo/energy-profiling"]
 debugmozjs = ["libservo/debugmozjs"]
 unstable = ["libservo/unstable"]
 webgl_backtrace = ["libservo/webgl_backtrace"]
+webrender_debugger = ["libservo/webrender_debugger"]
 js_backtrace = ["libservo/js_backtrace"]
 
 [target.'cfg(not(target_os = "android"))'.dependencies]

diff --git a/servo-tidy.toml b/servo-tidy.toml
@@ -32,9 +32,14 @@ rand = [
 [ignore]
 # Ignored packages with duplicated versions
 packages = [
+  "base64",
+  "block-buffer",
+  "byte-tools",
   "crossbeam-deque",
   "crossbeam-epoch",
   "crossbeam-utils",
+  "digest",
+  "generic-array",
   "rand",
   "unicase",
   "winapi",

diff --git a/...ata/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html.ini b/...ata/css/compositing/mix-blend-mode/mix-blend-mode-with-transform-and-preserve-3D.html.ini
diff --git a/tests/wpt/metadata/css/css-transforms/transform3d-perspective-005.html.ini b/tests/wpt/metadata/css/css-transforms/transform3d-perspective-005.html.ini
diff --git a/tests/wpt/metadata/css/filter-effects/blur-clip-stacking-context-001.html.ini b/tests/wpt/metadata/css/filter-effects/blur-clip-stacking-context-001.html.ini
@@ -0,0 +1,2 @@
+[blur-clip-stacking-context-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/xhr/setrequestheader-header-allowed.htm.ini b/tests/wpt/metadata/xhr/setrequestheader-header-allowed.htm.ini
@@ -1,6 +1,4 @@
 [setrequestheader-header-allowed.htm]
-  type: testharness
-  expected: CRASH
   bug: https://github.com/hyperium/http/pull/271
   [XMLHttpRequest: setRequestHeader() - headers that are allowed (Status-URI)]
     expected: FAIL

diff --git a/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini b/tests/wpt/webgl/meta/conformance/canvas/to-data-url-test.html.ini
@@ -1,4 +1,6 @@
 [to-data-url-test.html]
+  expected:
+    if os == "linux": CRASH
   [WebGL test #12: should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 

diff --git a/tests/wpt/webgl/meta/conformance/textures/misc/texture-size-cube-maps.html.ini b/tests/wpt/webgl/meta/conformance/textures/misc/texture-size-cube-maps.html.ini
@@ -1,4 +1,6 @@
 [texture-size-cube-maps.html]
+  expected:
+    if os == "linux": CRASH
   [WebGL test #87: 0, 0, 2, 1 should be green\nat (0, 0) expected: 0,255,0,255 was 0,255,255,255]
     expected: FAIL