Wait on frame work fences when frames are dropped am: 06e2e9cf4c am: 7a14f5aeb9

am: b53c60876a

Change-Id: Ib9c5be43f65379770b17260c34be90fccb360277

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

diff --cc libs/hwui/renderthread/CanvasContext.h
index a3b6261,e182175..7ebe0ae
--- 1/libs/hwui/renderthread/CanvasContext.h
--- 2/libs/hwui/renderthread/CanvasContext.h
+++ b/libs/hwui/renderthread/CanvasContext.h
@@@ -158,10 -168,9 +158,12 @@@ public
  
      ANDROID_API int64_t getFrameNumber();
  
+     void waitOnFences();
+ 
  private:
 +    CanvasContext(RenderThread& thread, bool translucent, RenderNode* rootRenderNode,
 +            IContextFactory* contextFactory, std::unique_ptr<IRenderPipeline> renderPipeline);
 +
      friend class RegisterFrameCallbackTask;
      // TODO: Replace with something better for layer & other GL object
      // lifecycle tracking
@@@ -171,12 -180,8 +173,10 @@@
  
      void freePrefetchedLayers(TreeObserver* observer);
  
-     void waitOnFences();
- 
      bool isSwapChainStuffed();
  
 +    SkRect computeDirtyRect(const Frame& frame, SkRect* dirty);
 +
      EGLint mLastFrameWidth = 0;
      EGLint mLastFrameHeight = 0;