From 88a04ac016f57c2d78e714682445dff2e7db4ade Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 11 Sep 2012 19:54:20 +0200 Subject: Imported WebKit commit 42d95198c30c2d1a94a5081181aad0b2be7c316c (http://svn.webkit.org/repository/webkit/trunk@128206) This includes the rewrite of the configure part of the build system which should fix the QtQuick2 detection and allow for further simplifications in the future --- Source/WebKit2/WebProcess/WebPage/WebPage.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Source/WebKit2/WebProcess/WebPage/WebPage.cpp') diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp index 8e151818a..eb8067079 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp @@ -1124,6 +1124,11 @@ void WebPage::setFixedLayoutSize(const IntSize& size) view->forceLayout(); } +void WebPage::setSuppressScrollbarAnimations(bool suppressAnimations) +{ + m_page->setShouldSuppressScrollbarAnimations(suppressAnimations); +} + void WebPage::setPaginationMode(uint32_t mode) { Pagination pagination = m_page->pagination(); @@ -3248,7 +3253,7 @@ static bool pageContainsAnyHorizontalScrollbars(Frame* mainFrame) for (HashSet::const_iterator it = scrollableAreas->begin(), end = scrollableAreas->end(); it != end; ++it) { ScrollableArea* scrollableArea = *it; - if (!scrollableArea->isOnActivePage()) + if (!scrollableArea->scrollbarsCanBeActive()) continue; if (hasEnabledHorizontalScrollbar(scrollableArea)) -- cgit v1.2.1