Title: [110966] trunk/Source/WebKit/blackberry
- Revision
- 110966
- Author
- [email protected]
- Date
- 2012-03-16 01:33:45 -0700 (Fri, 16 Mar 2012)
Log Message
[BlackBerry] viewportRect has changed to viewportSize
https://bugs.webkit.org/show_bug.cgi?id=81262
Patch by Genevieve Mak <[email protected]> on 2012-03-16
Reviewed by Antonio Gomes.
Set size instead of rect in constructor.
* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (110965 => 110966)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-03-16 08:27:28 UTC (rev 110965)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-03-16 08:33:45 UTC (rev 110966)
@@ -1,3 +1,14 @@
+2012-03-16 Genevieve Mak <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Enable PAGE_VISIBILITY_API
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (110965 => 110966)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-03-16 08:27:28 UTC (rev 110965)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-03-16 08:33:45 UTC (rev 110966)
@@ -61,7 +61,7 @@
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 @@
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);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
