Merged FrameView and LayoutBox scrolling in EventHandler.

third_party/WebKit/Source/web/tests/TopControlsTest.cpp

 /*
  * Copyright (C) 2015 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 149 matching lines @@
     webView->topControls().setShownRatio(1);
 
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollBegin));
     EXPECT_FLOAT_EQ(50.f, webView->topControls().contentOffset());
 
     // Top controls should be scrolled partially and page should not scroll.
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollUpdate, 0, -25.f));
     EXPECT_FLOAT_EQ(25.f, webView->topControls().contentOffset());
     EXPECT_POINT_EQ(IntPoint(0, 0), frame()->view()->scrollPosition());
 
-    // Top controls should consume 30px and become hidden. Excess scroll should be consumed by the page.
+    // Top controls should consume 25px and become hidden. Excess scroll should be consumed by the page.
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollUpdate, 0, -40.f));
     EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
     EXPECT_POINT_EQ(IntPoint(0, 15), frame()->view()->scrollPosition());
 
     // Only page should consume scroll
     webView->handleInputEvent(generateEvent(WebInputEvent::GestureScrollUpdate, 0, -20.f));
     EXPECT_FLOAT_EQ(0.f, webView->topControls().contentOffset());
     EXPECT_POINT_EQ(IntPoint(0, 35), frame()->view()->scrollPosition());
 }
 
@@ skipping 544 matching lines @@
     // that's 1600px wide so the minimum scale is 0.25 to encompass that.
     ASSERT_EQ(0.25f, webView->minimumPageScaleFactor());
 
     // The viewport will match the layout width at scale=0.5 so the height used
     // for vh should be (300 / 0.5) for the layout height + (100 / 0.5) for top
     // controls = 800.
     EXPECT_EQ(800, frame()->view()->viewportSizeForViewportUnits().height());
 }
 
 } // namespace blink