Fixing flakiness of TextureLayerChangeInvisibleMailboxTest

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 #include <stdint.h>
 #include <unordered_set>
@@ skipping 530 matching lines @@
 
     // Make a best effort to try to complete pending readbacks.
     // TODO(crbug.com/637035): Consider doing this in a better way,
     // ideally with the guarantee of readbacks completing.
     if (display_.get() && HavePendingReadbacks())
       display_->ForceImmediateDrawAndSwapIfPossible();
 
     host_->SetVisible(false);
     host_->ReleaseCompositorFrameSink();
     has_compositor_frame_sink_ = false;
-    pending_frames_ = 0;

[danakj, 2017/04/04 21:47:50]

Oh it looks like DidReceiveCompositorFrameSink is coming after
ReleaseCompositorFrameSink which it's not expecting.

[Saman Sami, 2017/04/04 21:54:17]

Yes probably.

     display_.reset();
   } else {
     host_->SetVisible(true);
     if (compositor_frame_sink_request_pending_)
       HandlePendingCompositorFrameSinkRequest();
   }
 }
 
 void CompositorImpl::SetWindowBounds(const gfx::Size& size) {
   if (size_ == size)
@@ skipping 299 matching lines @@
   }
   GetSurfaceManager()->UnregisterFrameSinkHierarchy(frame_sink_id_,
                                                     frame_sink_id);
 }
 
 bool CompositorImpl::HavePendingReadbacks() {
   return !readback_layer_tree_->children().empty();
 }
 
 }  // namespace content