Skip to content
Permalink
Browse files

Fix WebRender churn in `compositing`

  • Loading branch information...
pcwalton authored and jdm committed Jun 5, 2019
1 parent ae42048 commit 7915a7099f066fa6f1cdfb3c6e5fc6e84684c58a
Showing with 6 additions and 6 deletions.
  1. +4 −4 components/compositing/compositor.rs
  2. +2 −2 components/compositing/windowing.rs
@@ -43,8 +43,7 @@ use style_traits::viewport::ViewportConstraints;
use style_traits::{CSSPixel, DevicePixel, PinchZoomFactor};
use time::{now, precise_time_ns, precise_time_s};
use webrender_api::{self, HitTestFlags, HitTestResult, ScrollLocation};
use webrender_api::units::{DeviceIntPoint, DeviceIntSize, DevicePoint};
use webrender_api::units::{FramebufferIntSize, LayoutVector2D};
use webrender_api::units::{DeviceIntPoint, DeviceIntSize, DevicePoint, LayoutVector2D};
use webvr_traits::WebVRMainThreadHeartbeat;

#[derive(Debug, PartialEq)]
@@ -1167,7 +1166,8 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
for (id, _) in &self.pipeline_details {
let webrender_pipeline_id = id.to_webrender();
if let Some(webrender_api::Epoch(epoch)) =
self.webrender.current_epoch(webrender_pipeline_id)
self.webrender.current_epoch(self.webrender_document,
webrender_pipeline_id)
{
let epoch = Epoch(epoch);
pipeline_epochs.insert(*id, epoch);
@@ -1303,7 +1303,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
for (id, pending_epoch) in &self.pending_paint_metrics {
// we get the last painted frame id from webrender
if let Some(webrender_api::Epoch(epoch)) =
self.webrender.current_epoch(id.to_webrender())
self.webrender.current_epoch(self.webrender_document, id.to_webrender())
{
// and check if it is the one the layout thread is expecting,
let epoch = Epoch(epoch);
@@ -20,8 +20,8 @@ use std::rc::Rc;
use std::time::Duration;
use style_traits::DevicePixel;
use webrender_api::ScrollLocation;
use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize, DevicePoint};
use webrender_api::units::{FramebufferIntRect, FramebufferIntSize};
use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize};
use webrender_api::units::{DevicePoint, FramebufferIntSize};
use webvr::VRServiceManager;
use webvr_traits::WebVRMainThreadHeartbeat;

0 comments on commit 7915a70

Please sign in to comment.
You can’t perform that action at this time.