Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / tests / ProgrammaticScrollTest.cpp

diff --git a/src/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp b/src/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
index 3d47b0d..dd4d37f 100644 (file)
--- a/src/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
+++ b/src/third_party/WebKit/Source/web/tests/ProgrammaticScrollTest.cpp
@@ -1,21 +1,21 @@
 #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"
-#include "WebScriptSource.h"
-#include "WebSettings.h"
-#include "WebView.h"
-#include "WebViewImpl.h"
 #include "core/frame/FrameView.h"
 #include "core/rendering/RenderView.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebUnitTestSupport.h"
+#include "public/web/WebFrame.h"
+#include "public/web/WebFrameClient.h"
+#include "public/web/WebHistoryItem.h"
+#include "public/web/WebInputEvent.h"
+#include "public/web/WebScriptSource.h"
+#include "public/web/WebSettings.h"
+#include "public/web/WebView.h"
+#include "web/WebLocalFrameImpl.h"
+#include "web/WebViewImpl.h"
+#include "web/tests/FrameTestHelpers.h"
+#include "web/tests/URLTestHelpers.h"
+#include <gtest/gtest.h>
 
 using namespace WebCore;
 using namespace blink;
@@ -61,7 +61,8 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithScale)
     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));
@@ -90,7 +91,8 @@ TEST_F(ProgrammaticScrollTest, RestoreScrollPositionAndViewStateWithoutScale)
     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));