| Index: Source/WebKit/chromium/tests/WebFrameTest.cpp
|
| diff --git a/Source/WebKit/chromium/tests/WebFrameTest.cpp b/Source/WebKit/chromium/tests/WebFrameTest.cpp
|
| index ac3158719c1ed8d1d615e058ac22feeb6a5ca04e..e845fc733b2caf72a63fbc74900f716596e580f4 100644
|
| --- a/Source/WebKit/chromium/tests/WebFrameTest.cpp
|
| +++ b/Source/WebKit/chromium/tests/WebFrameTest.cpp
|
| @@ -1209,7 +1209,7 @@ TEST_F(WebFrameTest, DivAutoZoomParamsTest)
|
|
|
| void simulateDoubleTap(WebViewImpl* webViewImpl, WebPoint& point, float& scale)
|
| {
|
| - webViewImpl->animateZoomAroundPoint(point, WebViewImpl::DoubleTap);
|
| + webViewImpl->animateZoomToRect(WebCore::IntRect(point.x, point.y, 0, 0), WebViewImpl::DoubleTap);
|
| EXPECT_TRUE(webViewImpl->fakeDoubleTapAnimationPendingForTesting());
|
| WebCore::IntSize scrollDelta = webViewImpl->fakeDoubleTapTargetPositionForTesting() - webViewImpl->mainFrameImpl()->frameView()->scrollPosition();
|
| float scaleDelta = webViewImpl->fakeDoubleTapPageScaleFactorForTesting() / webViewImpl->pageScaleFactor();
|
| @@ -1261,7 +1261,7 @@ TEST_F(WebFrameTest, DivAutoZoomMultipleDivsTest)
|
|
|
| // If we didn't yet get an auto-zoom update and a second double-tap arrives, should go back to minimum scale.
|
| webViewImpl->applyScrollAndScale(WebSize(), 1.1f);
|
| - webViewImpl->animateZoomAroundPoint(topPoint, WebViewImpl::DoubleTap);
|
| + webViewImpl->animateZoomToRect(WebCore::IntRect(topPoint.x, topPoint.y, 0, 0), WebViewImpl::DoubleTap);
|
| EXPECT_TRUE(webViewImpl->fakeDoubleTapAnimationPendingForTesting());
|
| simulateDoubleTap(webViewImpl, bottomPoint, scale);
|
| EXPECT_FLOAT_EQ(webViewImpl->minimumPageScaleFactor(), scale);
|
|
|