Bug 1508555 - Update webrender to commit 6ffc7cfe02f2a914a7d4338510277988643cc441 (WR PR #3330). r=kats
authorWR Updater Bot <graphics-team@mozilla.staktrace.com>
Tue, 20 Nov 2018 19:41:55 +0000
changeset 503795 5dabc51178c6ad0a4a83ca9c22387c49d645553f
parent 503794 453589993f45bd5ac46350916fb843de25745aa7
child 503796 893aaa718e6fe4ba847498d65154cf1b961cf59e
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1508555
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1508555 - Update webrender to commit 6ffc7cfe02f2a914a7d4338510277988643cc441 (WR PR #3330). r=kats Differential Revision: https://phabricator.services.mozilla.com/D12468
gfx/webrender/src/profiler.rs
gfx/webrender/src/renderer.rs
gfx/webrender_bindings/revision.txt
--- a/gfx/webrender/src/profiler.rs
+++ b/gfx/webrender/src/profiler.rs
@@ -1247,37 +1247,42 @@ impl ChangeIndicator {
             counter: 0
         }
     }
 
     pub fn changed(&mut self) {
         self.counter = (self.counter + 1) % 15;
     }
 
+    const WIDTH : f32 = 20.0;
+    const HEIGHT: f32 = 10.0;
+
+    pub fn width() -> f32 {
+      ChangeIndicator::WIDTH * 16.0
+    }
+
     pub fn draw(
         &self,
         x: f32, y: f32,
         color: ColorU,
         debug_renderer: &mut DebugRenderer
     ) {
         let margin = 0.0;
-        let w = 10.0;
-        let h = 5.0;
-        let tx = self.counter as f32 * w;
+        let tx = self.counter as f32 * ChangeIndicator::WIDTH;
         debug_renderer.add_quad(
             x - margin,
             y - margin,
-            x + 15.0 * w + margin,
-            y + h + margin,
+            x + 15.0 * ChangeIndicator::WIDTH + margin,
+            y + ChangeIndicator::HEIGHT + margin,
             ColorU::new(0, 0, 0, 150),
             ColorU::new(0, 0, 0, 150),
         );
 
         debug_renderer.add_quad(
             x + tx,
             y,
-            x + tx + w,
-            y + h,
+            x + tx + ChangeIndicator::WIDTH,
+            y + ChangeIndicator::HEIGHT,
             color,
             ColorU::new(25, 25, 25, 255),
         );
     }
 }
--- a/gfx/webrender/src/renderer.rs
+++ b/gfx/webrender/src/renderer.rs
@@ -2660,28 +2660,28 @@ impl Renderer {
             if self.debug_flags.contains(DebugFlags::NEW_FRAME_INDICATOR) {
                 if let Some(debug_renderer) = self.debug.get_mut(&mut self.device) {
                     self.new_frame_indicator.changed();
                     self.new_frame_indicator.draw(
                         x, 0.0,
                         ColorU::new(0, 110, 220, 255),
                         debug_renderer,
                     );
-                    x += 160.0;
+                    x += ChangeIndicator::width();
                 }
             }
 
             if self.debug_flags.contains(DebugFlags::NEW_SCENE_INDICATOR) {
                 if let Some(debug_renderer) = self.debug.get_mut(&mut self.device) {
                     self.new_scene_indicator.draw(
                         x, 0.0,
                         ColorU::new(0, 220, 110, 255),
                         debug_renderer,
                     );
-                    x += 160.0;
+                    x += ChangeIndicator::width();
                 }
             }
 
             if self.debug_flags.contains(DebugFlags::SLOW_FRAME_INDICATOR) {
                 if let Some(debug_renderer) = self.debug.get_mut(&mut self.device) {
                     self.slow_frame_indicator.draw(
                         x, 0.0,
                         ColorU::new(220, 30, 10, 255),
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1,1 +1,1 @@
-85336e717d99c81e06b261a3958fe9ef90212e0c
+6ffc7cfe02f2a914a7d4338510277988643cc441