[Pinch-to-zoom] Moved scale factor into PinchViewport

Source/web/tests/ProgrammaticScrollTest.cpp

 #include "config.h"
 
 #include <gtest/gtest.h>
 #include "FrameTestHelpers.h"
 #include "URLTestHelpers.h"
 #include "WebFrame.h"
 #include "WebFrameClient.h"
 #include "WebFrameImpl.h"
 #include "WebHistoryItem.h"
 #include "WebInputEvent.h"
@@ skipping 43 matching lines @@
 
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "long_scroll.html", true, 0, 0);
     webView->resize(WebSize(1000, 1000));
     webView->layout();
 
     WebViewImpl* webViewImpl = toWebViewImpl(webView);
     LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
     frame->loader().setLoadType(FrameLoadTypeBackForward);
 
-    webViewImpl->setPageScaleFactor(3.0f, WebPoint(0, 500));
+    webViewImpl->setPageScaleFactor(3.0f);
+    webViewImpl->setMainFrameScrollOffset(WebPoint(0, 500));
     frame->view()->setWasScrolledByUser(false);
     frame->loader().currentItem()->setPageScaleFactor(2);
     frame->loader().currentItem()->setScrollPoint(WebPoint(0, 200));
 
     // Flip back the wasScrolledByUser flag which was set to true by setPageScaleFactor
     // because otherwise FrameLoader::restoreScrollPositionAndViewState does nothing.
     frame->view()->setWasScrolledByUser(false);
     frame->loader().restoreScrollPositionAndViewState();
 
     // Expect that both scroll and scale were restored, and that it was not a programmatic scroll.
     EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(200, webViewImpl->mainFrameImpl()->scrollOffset().height);
     EXPECT_TRUE(frame->view()->wasScrolledByUser());
 }
 
 TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale)
 {
     registerMockedHttpURLLoad("long_scroll.html");
 
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebView* webView = webViewHelper.initializeAndLoad(m_baseURL + "long_scroll.html", true, 0, 0);
     webView->resize(WebSize(1000, 1000));
     webView->layout();
 
     WebViewImpl* webViewImpl = toWebViewImpl(webView);
     LocalFrame* frame = webViewImpl->mainFrameImpl()->frame();
     frame->loader().setLoadType(FrameLoadTypeBackForward);
 
-    webViewImpl->setPageScaleFactor(3.0f, WebPoint(0, 500));
+    webViewImpl->setPageScaleFactor(3.0f);
+    webViewImpl->setMainFrameScrollOffset(WebPoint(0, 500));
     frame->view()->setWasScrolledByUser(false);
     frame->loader().currentItem()->setPageScaleFactor(0);
     frame->loader().currentItem()->setScrollPoint(WebPoint(0, 400));
 
     // FrameLoader::restoreScrollPositionAndViewState flows differently if scale is zero.
     frame->loader().restoreScrollPositionAndViewState();
 
     // Expect that only the scroll position was restored, and that it was not a programmatic scroll.
     EXPECT_EQ(3.0f, webViewImpl->pageScaleFactor());
     EXPECT_EQ(400, webViewImpl->mainFrameImpl()->scrollOffset().height);
     EXPECT_TRUE(frame->view()->wasScrolledByUser());
 }
 
 }