Merge \\"Change swap chain stuffed detection logic\\" into nyc-mr1-dev am: 433a19e8bf

am: 3c37412900

Change-Id: Id7e0d1d1dfb5448dd927c29361fb98aabf0cfe10

diff --cc libs/hwui/renderthread/CanvasContext.cpp
Simple merge

diff --cc libs/hwui/renderthread/CanvasContext.h
index 42e9be3,3eef29b..688bf2a
--- 1/libs/hwui/renderthread/CanvasContext.h
--- 2/libs/hwui/renderthread/CanvasContext.h
+++ b/libs/hwui/renderthread/CanvasContext.h
@@@ -200,9 -208,16 +200,12 @@@ private
      RingBuffer<SwapHistory, 3> mSwapHistory;
      int64_t mFrameNumber = -1;
  
+     // last vsync for a dropped frame due to stuffed queue
+     nsecs_t mLastDropVsync = 0;
+ 
      bool mOpaque;
 -#if HWUI_NEW_OPS
      BakedOpRenderer::LightInfo mLightInfo;
      FrameBuilder::LightGeometry mLightGeometry = { {0, 0, 0}, 0 };
 -#else
 -    OpenGLRenderer* mCanvas = nullptr;
 -#endif
  
      bool mHaveNewSurface = false;
      DamageAccumulator mDamageAccumulator;