Dismissing the GestureNav overlay after the first non-empty paint to improve UX/responsiveness

content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

 // Copyright 2014 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/web_contents/aura/overscroll_navigation_overlay.h"
 
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/web_contents/aura/image_window_delegate.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_web_contents.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
+#include "ui/gfx/codec/png_codec.h"
 
 namespace content {
 
 class OverscrollNavigationOverlayTest : public RenderViewHostImplTestHarness {
  public:
   OverscrollNavigationOverlayTest() {}
   virtual ~OverscrollNavigationOverlayTest() {}
 
   gfx::Image CreateDummyScreenshot() {
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1);
     bitmap.allocPixels();
     bitmap.eraseColor(SK_ColorWHITE);
     return gfx::Image::CreateFrom1xBitmap(bitmap);
   }
 
   void SetDummyScreenshotOnNavEntry(NavigationEntry* entry) {
-    const unsigned char* raw_data =
-        reinterpret_cast<const unsigned char*>("garbage");
-    const int length = 5;
-    std::vector<unsigned char> data_vector(raw_data, raw_data+length);
+    SkBitmap bitmap;
+    bitmap.setConfig(SkBitmap::kARGB_8888_Config, 1, 1);
+    bitmap.allocPixels();
+    bitmap.eraseColor(SK_ColorWHITE);
+    std::vector<unsigned char> png_data;
+    gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &png_data);
     scoped_refptr<base::RefCountedBytes> png_bytes =
-        base::RefCountedBytes::TakeVector(&data_vector);
+        base::RefCountedBytes::TakeVector(&png_data);
     NavigationEntryImpl* entry_impl =
         NavigationEntryImpl::FromNavigationEntry(entry);
     entry_impl->SetScreenshotPNGData(png_bytes);
   }
 
   void ReceivePaintUpdate() {
     ViewHostMsg_DidFirstVisuallyNonEmptyPaint msg(
         test_rvh()->GetRoutingID(), 0);
     RenderViewHostTester::TestOnMessageReceived(test_rvh(), msg);
   }
@@ skipping 72 matching lines @@
   scoped_ptr<OverscrollNavigationOverlay> overlay_;
 
   DISALLOW_COPY_AND_ASSIGN(OverscrollNavigationOverlayTest);
 };
 
 TEST_F(OverscrollNavigationOverlayTest, FirstVisuallyNonEmptyPaint_NoImage) {
   ReceivePaintUpdate();
   EXPECT_TRUE(GetOverlay()->received_paint_update_);
   EXPECT_FALSE(GetOverlay()->loading_complete_);
 
-  // The paint update will hide the overlay, although the page hasn't completely
-  // loaded yet. This is because the image-delegate doesn't have an image set.
+  EXPECT_TRUE(GetOverlay()->received_paint_update_);
+  EXPECT_FALSE(GetOverlay()->loading_complete_);
+  // The paint update will hide the overlay.
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, FirstVisuallyNonEmptyPaint_WithImage) {
   GetOverlay()->image_delegate_->SetImage(CreateDummyScreenshot());
 
   ReceivePaintUpdate();
   EXPECT_TRUE(GetOverlay()->received_paint_update_);
   EXPECT_FALSE(GetOverlay()->loading_complete_);
-  EXPECT_TRUE(GetOverlay()->web_contents());
-
-  contents()->TestSetIsLoading(false);
-  EXPECT_TRUE(GetOverlay()->loading_complete_);
+  // The paint update will hide the overlay.
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, PaintUpdateWithoutNonEmptyPaint) {
   GetOverlay()->image_delegate_->SetImage(CreateDummyScreenshot());
   process()->sink().ClearMessages();
 
   // The page load is complete, but the overlay should still be visible, because
   // there hasn't been any paint update.
   // This should also send a repaint request to the renderer, so that the
@@ skipping 15 matching lines @@
   ViewHostMsg_UpdateRect rect(test_rvh()->GetRoutingID(), params);
   RenderViewHostTester::TestOnMessageReceived(test_rvh(), rect);
   EXPECT_TRUE(GetOverlay()->received_paint_update_);
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, MultiNavigation_PaintUpdate) {
   GetOverlay()->image_delegate_->SetImage(CreateDummyScreenshot());
   SetDummyScreenshotOnNavEntry(controller().GetEntryAtOffset(-1));
 
-  ReceivePaintUpdate();
-  EXPECT_TRUE(GetOverlay()->received_paint_update_);
-
   PerformBackNavigationViaSliderCallbacks();
   // Screenshot was set on NavEntry at offset -1.
   EXPECT_TRUE(GetOverlay()->image_delegate_->has_image());
-  // Navigation was started, so the paint update flag should be reset.
   EXPECT_FALSE(GetOverlay()->received_paint_update_);
 
   ReceivePaintUpdate();
   // Paint updates until the navigation is committed represent updates
   // for the previous page, so they shouldn't affect the flag.
   EXPECT_FALSE(GetOverlay()->received_paint_update_);
 
   contents()->CommitPendingNavigation();
   ReceivePaintUpdate();
   // Navigation was committed and the paint update was received - the flag
   // should now be updated.
   EXPECT_TRUE(GetOverlay()->received_paint_update_);
 
-  EXPECT_TRUE(GetOverlay()->web_contents());
-  contents()->TestSetIsLoading(true);
-  contents()->TestSetIsLoading(false);
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, MultiNavigation_LoadingUpdate) {
   GetOverlay()->image_delegate_->SetImage(CreateDummyScreenshot());
 
   contents()->TestSetIsLoading(false);
   EXPECT_TRUE(GetOverlay()->loading_complete_);
 
   PerformBackNavigationViaSliderCallbacks();
@@ skipping 14 matching lines @@
   // Navigation was committed and the load update was received - the flag
   // should now be updated.
   EXPECT_TRUE(GetOverlay()->loading_complete_);
 
   EXPECT_TRUE(GetOverlay()->web_contents());
   ReceivePaintUpdate();
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 }  // namespace content