Bug 1166165 - Check if the timestamp is null to prevent assertion. r=nical
☠☠ backed out by 51cd9ce32bba ☠ ☠
authorEthan Lin <etlin@mozilla.com>
Tue, 19 May 2015 00:37:00 -0400
changeset 244805 bcc398de6eda20470eddd21b8be2fcd8d61d09c7
parent 244804 edb5b81dd9e76fb76c0a8d38e214c9593a0f9c0a
child 244806 fe3723f241a81b4ab00f8bd135a63a6ae946dc86
push id13061
push userkwierso@gmail.com
push dateThu, 21 May 2015 01:32:04 +0000
treeherderfx-team@d0a72997ef97 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1166165
milestone41.0a1
Bug 1166165 - Check if the timestamp is null to prevent assertion. r=nical
gfx/layers/composite/LayerManagerComposite.cpp
--- a/gfx/layers/composite/LayerManagerComposite.cpp
+++ b/gfx/layers/composite/LayerManagerComposite.cpp
@@ -412,17 +412,17 @@ LayerManagerComposite::RenderDebugOverla
       mFPS = MakeUnique<FPSState>();
     }
 
     float alpha = 1;
 #ifdef ANDROID
     // Draw a translation delay warning overlay
     int width;
     int border;
-    if ((now - mWarnTime).ToMilliseconds() < kVisualWarningDuration) {
+    if (!mWarnTime.IsNull() && (now - mWarnTime).ToMilliseconds() < kVisualWarningDuration) {
       EffectChain effects;
 
       // Black blorder
       border = 4;
       width = 6;
       effects.mPrimaryEffect = new EffectSolidColor(gfx::Color(0, 0, 0, 1));
       mCompositor->DrawQuad(gfx::Rect(border, border, aBounds.width - 2 * border, width),
                             aBounds, effects, alpha, gfx::Matrix4x4());