Mac: Update scrollbar size and input position during impl-overscroll

Source/web/tests/WebInputEventConversionTest.cpp

 /*
  * Copyright (C) 2012 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 711 matching lines @@
         EXPECT_FLOAT_EQ(10.4f, webTouchEvent.touches[0].position.y);
 
         PlatformTouchEventBuilder platformTouchBuilder(view, webTouchEvent);
         EXPECT_FLOAT_EQ(10.6f, platformTouchBuilder.touchPoints()[0].screenPos().x());
         EXPECT_FLOAT_EQ(10.4f, platformTouchBuilder.touchPoints()[0].screenPos().y());
         EXPECT_FLOAT_EQ(5.3f + pinchOffset.x(), platformTouchBuilder.touchPoints()[0].pos().x());
         EXPECT_FLOAT_EQ(5.2f + pinchOffset.y(), platformTouchBuilder.touchPoints()[0].pos().y());
     }
 }
 
+TEST(WebInputEventConversionTest, ElasticOverscroll)
+{
+    const std::string baseURL("http://www.test4.com/");
+    const std::string fileName("fixed_layout.html");
+
+    URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true, 0, 0, setupVirtualViewportPinch);
+    int pageWidth = 640;
+    int pageHeight = 480;
+    webViewImpl->resize(WebSize(pageWidth, pageHeight));
+    webViewImpl->layout();
+
+    FrameView* view = toLocalFrame(webViewImpl->page()->mainFrame())->view();
+    view->setElasticOverscroll(FloatSize(10, -20));

[Ken Russell (switch to Gerrit), 2014/12/22 23:46:08]

Please factor the FloatSize into a separate variable so the math's more obvious.

[ccameron, 2014/12/22 23:57:23]

Done.

[ccameron, 2014/12/22 23:57:23]

Done.

+
+    // Just elastic overscroll.
+    {
+        WebMouseEvent webMouseEvent;
+        webMouseEvent.type = WebInputEvent::MouseMove;
+        webMouseEvent.x = 10;
+        webMouseEvent.y = 50;
+        webMouseEvent.windowX = 10;
+        webMouseEvent.windowY = 50;
+        webMouseEvent.globalX = 10;
+        webMouseEvent.globalY = 50;
+
+        PlatformMouseEventBuilder platformMouseBuilder(view, webMouseEvent);
+        EXPECT_EQ(20, platformMouseBuilder.position().x());
+        EXPECT_EQ(30, platformMouseBuilder.position().y());

[Ken Russell (switch to Gerrit), 2014/12/22 23:46:08]

Would be better if these constants referred to the FloatSize's elements above.

[ccameron, 2014/12/22 23:57:23]

Done.

+        EXPECT_EQ(10, platformMouseBuilder.globalPosition().x());
+        EXPECT_EQ(50, platformMouseBuilder.globalPosition().y());
+    }
+
+    // Elastic overscroll and pinch-zoom (this doesn't actually ever happen,
+    // but ensure that if it were to, the overscroll would be applied after the
+    // pinch-zoom).
+    webViewImpl->setPageScaleFactor(2);
+    IntPoint pinchOffset(35, 60);
+    webViewImpl->page()->frameHost().pinchViewport().setLocation(pinchOffset);
+    {
+        WebMouseEvent webMouseEvent;
+        webMouseEvent.type = WebInputEvent::MouseMove;
+        webMouseEvent.x = 10;
+        webMouseEvent.y = 10;
+        webMouseEvent.windowX = 10;
+        webMouseEvent.windowY = 10;
+        webMouseEvent.globalX = 10;
+        webMouseEvent.globalY = 10;
+
+        PlatformMouseEventBuilder platformMouseBuilder(view, webMouseEvent);
+        EXPECT_EQ(5 + pinchOffset.x() + 10, platformMouseBuilder.position().x());
+        EXPECT_EQ(5 + pinchOffset.y() - 20, platformMouseBuilder.position().y());

[Ken Russell (switch to Gerrit), 2014/12/22 23:46:08]

In particular, it would be better if the "+10" and "-20" referred to the
elements of the FloatSize above.

+        EXPECT_EQ(10, platformMouseBuilder.globalPosition().x());
+        EXPECT_EQ(10, platformMouseBuilder.globalPosition().y());
+    }
+}
+
 TEST(WebInputEventConversionTest, WebMouseWheelEventBuilder)
 {
     const std::string baseURL("http://www.test5.com/");
     const std::string fileName("fixed_layout.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("fixed_layout.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
     int pageWidth = 640;
     int pageHeight = 480;
@@ skipping 47 matching lines @@
         PlatformWheelEventBuilder platformWheelBuilder(view, webMouseWheelEvent);
         EXPECT_EQ(0, platformWheelBuilder.position().x());
         EXPECT_EQ(5, platformWheelBuilder.position().y());
         EXPECT_EQ(10, platformWheelBuilder.deltaX());
         EXPECT_EQ(15, platformWheelBuilder.deltaY());
         EXPECT_EQ(WebInputEvent::ControlKey, platformWheelBuilder.modifiers());
         EXPECT_TRUE(platformWheelBuilder.hasPreciseScrollingDeltas());
         EXPECT_TRUE(platformWheelBuilder.canScroll());
     }
 }
+
 } // anonymous namespace