[BlackBerry] viewportRect has changed to viewportSize

https://bugs.webkit.org/show_bug.cgi?id=81262

Patch by Genevieve Mak <gmak@rim.com> on 2012-03-16
Reviewed by Antonio Gomes.

Set size instead of rect in constructor.
* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):

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

diff --git a/Source/WebKit/blackberry/ChangeLog b/Source/WebKit/blackberry/ChangeLog
index c86402ee0952eb5305462f9f103b00669a8ea691..37a2d0ee3d0a237d3ca66e3504c1fa4bf98ccbc8 100644 (file)
--- a/Source/WebKit/blackberry/ChangeLog
+++ b/Source/WebKit/blackberry/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-16  Genevieve Mak  <gmak@rim.com>
+
+        [BlackBerry] viewportRect has changed to viewportSize
+        https://bugs.webkit.org/show_bug.cgi?id=81262
+
+        Reviewed by Antonio Gomes.
+
+        Set size instead of rect in constructor.
+        * WebKitSupport/InRegionScrollableArea.cpp:
+        (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+
 2012-03-16  Andrew Lo  <anlo@rim.com>
 
         [BlackBerry] Enable PAGE_VISIBILITY_API

diff --git a/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp b/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp
index 5eac31a30dffcd299c99d59f1c07d30a2eeb562b..f9fb7488238f711f38bc7530571519f9599a8d85 100644 (file)
--- a/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp
+++ b/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp
@@ -61,7 +61,7 @@ InRegionScrollableArea::InRegionScrollableArea(WebPagePrivate* webPage, RenderLa
 
         m_scrollPosition = m_webPage->mapToTransformed(view->scrollPosition());
         m_contentsSize = m_webPage->mapToTransformed(view->contentsSize());
-        m_viewportRect = m_webPage->mapToTransformed(view->visibleContentRect(false /*includeScrollbars*/));
+        m_viewportSize = m_webPage->mapToTransformed(view->visibleContentRect(false /*includeScrollbars*/)).size();
 
         m_visibleWindowRect = m_webPage->mapToTransformed(m_webPage->getRecursiveVisibleWindowRect(view));
         IntRect transformedWindowRect = IntRect(IntPoint::zero(), m_webPage->transformedViewportSize());
@@ -87,7 +87,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_viewportRect = m_webPage->mapToTransformed(scrollableArea->visibleContentRect(false /*includeScrollbars*/));
+        m_viewportSize = m_webPage->mapToTransformed(scrollableArea->visibleContentRect(false /*includeScrollbars*/)).size();
 
         m_visibleWindowRect = m_layer->renderer()->absoluteClippedOverflowRect();
         m_visibleWindowRect = m_layer->renderer()->frame()->view()->contentsToWindow(m_visibleWindowRect);