Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1564)

Unified Diff: Source/web/tests/PinchViewportTest.cpp

Issue 271793007: Fix webkit_unit_tests to use the threaded parser and enable everywhere. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add loadHistoryItem wrapper Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/web/tests/PinchViewportTest.cpp
diff --git a/Source/web/tests/PinchViewportTest.cpp b/Source/web/tests/PinchViewportTest.cpp
index 0b1821794951c1c4b7ce3d9f8d860c79d1bac27a..d157949ca039538e35601a1c0c8950e078a9d029 100644
--- a/Source/web/tests/PinchViewportTest.cpp
+++ b/Source/web/tests/PinchViewportTest.cpp
@@ -59,7 +59,6 @@
using namespace WebCore;
using namespace blink;
-using blink::FrameTestHelpers::runPendingTasks;
namespace {
@@ -90,7 +89,6 @@ public:
void navigateTo(const std::string& url)
{
FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url);
- Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
}
void forceFullCompositingUpdate()
@@ -103,12 +101,6 @@ public:
URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(fileName.c_str()));
}
- void executeScript(const WebString& code)
- {
- webViewImpl()->mainFrame()->executeScript(WebScriptSource(code));
- runPendingTasks();
- }
-
WebLayer* getRootScrollLayer()
{
RenderLayerCompositor* compositor = frame()->contentRenderer()->compositor();
@@ -524,8 +516,7 @@ TEST_F(PinchViewportTest, TestRestoredFromHistoryItem)
item.setPinchViewportScrollOffset(WebFloatPoint(100, 120));
item.setPageScaleFactor(2);
- webViewImpl()->mainFrame()->loadHistoryItem(item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
- Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+ FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
EXPECT_EQ(2, pinchViewport.scale());
@@ -552,8 +543,7 @@ TEST_F(PinchViewportTest, TestRestoredFromLegacyHistoryItem)
item.setScrollOffset(WebPoint(120, 180));
item.setPageScaleFactor(2);
- webViewImpl()->mainFrame()->loadHistoryItem(item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
- Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+ FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
PinchViewport& pinchViewport = frame()->page()->frameHost().pinchViewport();
EXPECT_EQ(2, pinchViewport.scale());

Powered by Google App Engine
This is Rietveld 408576698