| Index: third_party/WebKit/Source/web/tests/TouchActionTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/TouchActionTest.cpp b/third_party/WebKit/Source/web/tests/TouchActionTest.cpp
|
| index 4d101cc7f9ca7998a4af7839eb0f736cda2e3285..b3f223e0a1901d8ca60bb0bdcc8c67a5782cea3a 100644
|
| --- a/third_party/WebKit/Source/web/tests/TouchActionTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/TouchActionTest.cpp
|
| @@ -210,6 +210,13 @@ WebView* TouchActionTest::setupTest(std::string file, TouchActionTrackingWebView
|
| return webView;
|
| }
|
|
|
| +IntRect windowClipRect(const FrameView& frameView)
|
| +{
|
| + LayoutRect clipRect(LayoutPoint(), LayoutSize(frameView.visibleContentSize(ExcludeScrollbars)));
|
| + frameView.layoutViewItem().mapToVisualRectInAncestorSpace(&frameView.layoutView()->containerForPaintInvalidation(), clipRect);
|
| + return enclosingIntRect(clipRect);
|
| +}
|
| +
|
| void TouchActionTest::runTestOnTree(ContainerNode* root, WebView* webView, TouchActionTrackingWebViewClient& client)
|
| {
|
| // Find all elements to test the touch-action of in the document.
|
| @@ -271,7 +278,7 @@ void TouchActionTest::runTestOnTree(ContainerNode* root, WebView* webView, Touch
|
|
|
| LocalFrame* mainFrame = static_cast<LocalFrame*>(webView->mainFrame()->toImplBase()->frame());
|
| FrameView* mainFrameView = mainFrame->view();
|
| - IntRect visibleRect = mainFrameView->windowClipRect();
|
| + IntRect visibleRect = windowClipRect(*mainFrameView);
|
| ASSERT_TRUE(visibleRect.contains(windowPoint)) << failureContextPos
|
| << " Test point not contained in visible area: " << visibleRect.x() << "," << visibleRect.y()
|
| << "-" << visibleRect.maxX() << "," << visibleRect.maxY();
|
|
|