Removing listening for repaints (OnUpdateRect) from OverscrollNavigationOverlay.

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/browser/web_contents/web_contents_view.h"
 #include "content/common/view_messages.h"
@@ skipping 38 matching lines @@
     RenderViewHostTester::TestOnMessageReceived(test_rvh(), msg);
   }
 
   void PerformBackNavigationViaSliderCallbacks() {
     // Sets slide direction to SLIDE_BACK, sets screenshot from NavEntry at
     // offset -1  on layer_delegate_.
     delete GetOverlay()->CreateBackLayer();
     // Performs BACK navigation, sets image from layer_delegate_ on
     // image_delegate_.
     GetOverlay()->OnWindowSlideCompleting();
-    GetOverlay()->OnWindowSlideCompleted();
+    GetOverlay()->OnWindowSlideCompleted(scoped_ptr<ui::Layer>());
   }
 
  protected:
   // RenderViewHostImplTestHarness:
   virtual void SetUp() OVERRIDE {
     RenderViewHostImplTestHarness::SetUp();
 
     const GURL first("https://www.google.com");
     contents()->NavigateAndCommit(first);
     EXPECT_TRUE(controller().GetVisibleEntry());
@@ skipping 44 matching lines @@
  private:
   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_);
-
-  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_);
   // The paint update will hide the overlay.
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
-TEST_F(OverscrollNavigationOverlayTest, PaintUpdateWithoutNonEmptyPaint) {
+TEST_F(OverscrollNavigationOverlayTest, LoadUpdateWithoutNonEmptyPaint) {
   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
-  // renderer repaints the contents.
   contents()->TestSetIsLoading(false);
+  EXPECT_TRUE(GetOverlay()->loading_complete_);
   EXPECT_FALSE(GetOverlay()->received_paint_update_);
-  EXPECT_TRUE(GetOverlay()->loading_complete_);
-  EXPECT_TRUE(GetOverlay()->web_contents());
-  EXPECT_TRUE(process()->sink().GetFirstMessageMatching(ViewMsg_Repaint::ID));
-
-  // Receive a repaint ack update. This should hide the overlay.
-  ViewHostMsg_UpdateRect_Params params;
-  memset(&params, 0, sizeof(params));
-  params.view_size = gfx::Size(10, 10);
-  params.flags = ViewHostMsg_UpdateRect_Flags::IS_REPAINT_ACK;
-  ViewHostMsg_UpdateRect rect(test_rvh()->GetRoutingID(), params);
-  RenderViewHostTester::TestOnMessageReceived(test_rvh(), rect);
-  EXPECT_TRUE(GetOverlay()->received_paint_update_);
+  // The page load should hide the overlay.
   EXPECT_FALSE(GetOverlay()->web_contents());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, MultiNavigation_PaintUpdate) {
   GetOverlay()->image_delegate_->SetImage(CreateDummyScreenshot());
   SetDummyScreenshotOnNavEntry(controller().GetEntryAtOffset(-1));
 
   PerformBackNavigationViaSliderCallbacks();
   // Screenshot was set on NavEntry at offset -1.
   EXPECT_TRUE(GetOverlay()->image_delegate_->has_image());
   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_FALSE(GetOverlay()->web_contents());
 }
 
 TEST_F(OverscrollNavigationOverlayTest, MultiNavigation_LoadingUpdate) {
   GetOverlay()->image_delegate_->SetImage(CreateDummyScreenshot());
 
-  contents()->TestSetIsLoading(false);
-  EXPECT_TRUE(GetOverlay()->loading_complete_);
-
   PerformBackNavigationViaSliderCallbacks();
   // No screenshot was set on NavEntry at offset -1.
   EXPECT_FALSE(GetOverlay()->image_delegate_->has_image());
   // Navigation was started, so the loading status flag should be reset.
   EXPECT_FALSE(GetOverlay()->loading_complete_);
 
   // Load updates until the navigation is committed represent updates for the
-  //  previous page, so they shouldn't affect the flag.
+  // previous page, so they shouldn't affect the flag.
   contents()->TestSetIsLoading(true);
   contents()->TestSetIsLoading(false);
   EXPECT_FALSE(GetOverlay()->loading_complete_);
 
   contents()->CommitPendingNavigation();
   contents()->TestSetIsLoading(true);
   contents()->TestSetIsLoading(false);
   // 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