Sync changes from mozilla-central gfx/wr

peek-poke/tests/max_size.rs

@@ -52,7 +52,7 @@ fn test_fixed_size_array() {
 
 #[test]
 fn test_tuple() {
-    assert_eq!(<(isize)>::max_size(), size_of::<isize>());
+    assert_eq!(<(isize, )>::max_size(), size_of::<isize>());
     assert_eq!(<(isize, isize, isize)>::max_size(), 3 * size_of::<isize>());
     assert_eq!(<(isize, ())>::max_size(), size_of::<isize>());
 }

tileview/src/tilecache_base.css

@@ -13,7 +13,19 @@
 	background: white;
 }
 
-.intern_header {
+.datasheet .header {
+	color: white;
+	font-family: Arial;
+	font-weight: bold;
+	font-size: 150%;
+	line-height: 200%;
+	background-color: grey;
+	margin-top: 15px;
+	margin-bottom: 5px;
+	padding-left: 10px;
+}
+
+.datasheet .subheader {
 	color: blue;
 	font-family: Arial;
 	font-weight: bold;
@@ -23,26 +35,29 @@
 	margin-bottom: 5px;
 }
 
-.intern_data {
+.datasheet .data {
 	font-family: monospace;
-	font-size: small;
+	margin-bottom: 5px;
 }
 
-.intern_data .insert:nth-child(even) {
+.datasheet .data *:nth-child(even) {
 	background: #FFFFFF;
 }
-.intern_data .insert:nth-child(odd) {
+.datasheet .data *:nth-child(odd) {
 	background: #EFEFEF;
 }
 
-.intern_data .insert {
-	color: #008000;
+.datasheet .data .insert {
+	color: #006000;
 }
 
-.intern_data .remove {
-	color: #800000;
+.datasheet .data .remove {
+	color: #600000;
 }
 
+.datasheet .data .change {
+	color: #000060;
+}
 
 
 .split {
@@ -58,7 +73,7 @@
 
 .right {
 	right: 0;
-	width: 25%;
+	width: 30%;
 	height: 90%;
 }
 

webrender/src/intern.rs

@@ -125,6 +125,7 @@ pub enum UpdateKind {
 #[derive(MallocSizeOf)]
 pub struct Update {
     pub index: usize,
+    pub uid: ItemUid,
     pub kind: UpdateKind,
 }
 
@@ -261,9 +262,12 @@ impl<I: Internable> Interner<I> {
             None => self.local_data.len(),
         };
 
+        let uid = ItemUid::next_uid();
+
         // Add a pending update to insert the new data.
         self.updates.push(Update {
             index,
+            uid,
             kind: UpdateKind::Insert,
         });
         self.update_data.alloc().init(data.clone());
@@ -272,7 +276,7 @@ impl<I: Internable> Interner<I> {
         let handle = Handle {
             index: index as u32,
             epoch: self.current_epoch,
-            uid: ItemUid::next_uid(),
+            uid,
             _marker: PhantomData,
         };
 
@@ -316,6 +320,7 @@ impl<I: Internable> Interner<I> {
                 free_list.push(handle.index as usize);
                 updates.push(Update {
                     index: handle.index as usize,
+                    uid: handle.uid,
                     kind: UpdateKind::Remove,
                 });
                 return false;

webrender/src/lib.rs

@@ -221,6 +221,7 @@ pub use crate::screen_capture::{AsyncScreenshotHandle, RecordedFrameHandle};
 pub use crate::shade::{Shaders, WrShaders};
 pub use api as webrender_api;
 pub use webrender_build::shader::ProgramSourceDigest;
-pub use crate::picture::{TileDescriptor, TileId, InvalidationReason, PrimitiveCompareResult};
+pub use crate::picture::{TileDescriptor, TileId, InvalidationReason};
+pub use crate::picture::{PrimitiveCompareResult, PrimitiveCompareResultDetail, CompareHelperResult};
 pub use crate::picture::{TileNode, TileNodeKind, TileSerializer, TileCacheInstanceSerializer, TileOffset, TileCacheLoggerUpdateLists};
-pub use crate::intern::{Update,UpdateKind};
+pub use crate::intern::{Update, UpdateKind, ItemUid};