| Index: Source/web/tests/PinchViewportTest.cpp
|
| diff --git a/Source/web/tests/PinchViewportTest.cpp b/Source/web/tests/PinchViewportTest.cpp
|
| index ffda5797c89adee273ca35f405715e8b0bc2b491..1558189c45f76218f83d38ab29b4df61c2e26e31 100644
|
| --- a/Source/web/tests/PinchViewportTest.cpp
|
| +++ b/Source/web/tests/PinchViewportTest.cpp
|
| @@ -52,6 +52,7 @@
|
|
|
| using namespace WebCore;
|
| using namespace blink;
|
| +using blink::FrameTestHelpers::runPendingTasks;
|
|
|
| namespace {
|
|
|
| @@ -82,6 +83,7 @@
|
| void navigateTo(const std::string& url)
|
| {
|
| FrameTestHelpers::loadFrame(webViewImpl()->mainFrame(), url);
|
| + Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
|
| }
|
|
|
| void forceFullCompositingUpdate()
|
| @@ -92,6 +94,12 @@
|
| void registerMockedHttpURLLoad(const std::string& fileName)
|
| {
|
| 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()
|
|
|