[BlackBerry] InRegionScrollableArea: fix call to visibleContentRect()
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Mar 2013 08:16:51 +0000 (08:16 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 14 Mar 2013 08:16:51 +0000 (08:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=112244

Patch by Alberto Garcia <agarcia@igalia.com> on 2013-03-14
Reviewed by Rob Buis.

Since r143295 visibleContentRect() receives an enum, not a boolean.

* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@145792 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/blackberry/ChangeLog
Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp

index 7f0b906..6c004cb 100644 (file)
@@ -1,3 +1,15 @@
+2013-03-14  Alberto Garcia  <agarcia@igalia.com>
+
+        [BlackBerry] InRegionScrollableArea: fix call to visibleContentRect()
+        https://bugs.webkit.org/show_bug.cgi?id=112244
+
+        Reviewed by Rob Buis.
+
+        Since r143295 visibleContentRect() receives an enum, not a boolean.
+
+        * WebKitSupport/InRegionScrollableArea.cpp:
+        (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+
 2013-03-13  Iris Wu  <shuwu@blackberry.com>
 
         [BlackBerry] Do not do scroll position adjustment if selecting in a subframe
index 7404435..99eccb3 100644 (file)
@@ -81,7 +81,7 @@ InRegionScrollableArea::InRegionScrollableArea(WebPagePrivate* webPage, RenderLa
 
         m_scrollPosition = m_webPage->mapToTransformed(view->scrollPosition());
         m_contentsSize = m_webPage->mapToTransformed(view->contentsSize());
-        m_viewportSize = m_webPage->mapToTransformed(view->visibleContentRect(false /*includeScrollbars*/)).size();
+        m_viewportSize = m_webPage->mapToTransformed(view->visibleContentRect(ScrollableArea::ExcludeScrollbars)).size();
         m_documentViewportRect = view->frameRect();
 
         m_scrollsHorizontally = view->contentsWidth() > view->visibleWidth();
@@ -105,7 +105,7 @@ InRegionScrollableArea::InRegionScrollableArea(WebPagePrivate* webPage, RenderLa
         ScrollableArea* scrollableArea = static_cast<ScrollableArea*>(m_layer);
         m_scrollPosition = m_webPage->mapToTransformed(scrollableArea->scrollPosition());
         m_contentsSize = m_webPage->mapToTransformed(scrollableArea->contentsSize());
-        m_viewportSize = m_webPage->mapToTransformed(scrollableArea->visibleContentRect(false /*includeScrollbars*/)).size();
+        m_viewportSize = m_webPage->mapToTransformed(scrollableArea->visibleContentRect(ScrollableArea::ExcludeScrollbars)).size();
         m_documentViewportRect = enclosingIntRect(box->absoluteClippedOverflowRect());
 
         m_scrollsHorizontally = box->scrollWidth() != box->clientWidth();