Auto merge of #15111 - glennw:wr-update-generate, r=jdm

bors-servo · web-flow · commit a81a712ca3fb · 2017-01-19T12:57:55.000-08:00
Update WR (radial gradients, generate_frame API, mac subpixel improvements, ANGLE shader support).  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15111)
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
@@ -749,6 +749,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
 
         let pipeline_id = frame_tree.pipeline.id.to_webrender();
         self.webrender_api.set_root_pipeline(pipeline_id);
+        self.webrender_api.generate_frame();
 
         self.create_pipeline_details_for_frame_tree(&frame_tree);
 
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
@@ -49,7 +49,7 @@ features = ["serde_derive", "ipc"]
 [target.'cfg(target_os = "macos")'.dependencies]
 byteorder = "0.5"
 core-foundation = "0.2"
-core-graphics = "0.4"
+core-graphics = "0.5"
 core-text = "2.0"
 
 [target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
@@ -980,6 +980,7 @@ impl LayoutThread {
                 webrender_traits::Epoch(epoch_number),
                 viewport_size,
                 builder);
+            self.webrender_api.generate_frame();
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -980,6 +980,7 @@ impl LayoutThread {`
`980`	`980`	`webrender_traits::Epoch(epoch_number),`
`981`	`981`	`viewport_size,`
`982`	`982`	`builder);`
	`983`	`+ self.webrender_api.generate_frame();`
`983`	`984`	`});`
`984`	`985`	`}`
`985`	`986`