Title: [145396] trunk/Source/WebKit/blackberry
- Revision
- 145396
- Author
- [email protected]
- Date
- 2013-03-11 13:40:50 -0700 (Mon, 11 Mar 2013)
Log Message
[BlackBerry] Set the documentViewportRect and viewport size.
https://bugs.webkit.org/show_bug.cgi?id=112056
Patch by Genevieve Mak <[email protected]> on 2013-03-11
Reviewed by Rob Buis.
Internally reviewed by Mike Fenton and Jakob Petsovits.
PR #278490
* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (145395 => 145396)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-03-11 20:22:24 UTC (rev 145395)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-03-11 20:40:50 UTC (rev 145396)
@@ -1,3 +1,16 @@
+2013-03-11 Genevieve Mak <[email protected]>
+
+ [BlackBerry] Set the documentViewportRect and viewport size.
+ https://bugs.webkit.org/show_bug.cgi?id=112056
+
+ Reviewed by Rob Buis.
+
+ Internally reviewed by Mike Fenton and Jakob Petsovits.
+ PR #278490
+
+ * WebKitSupport/InRegionScrollableArea.cpp:
+ (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+
2013-03-11 Alberto Garcia <[email protected]>
[BlackBerry] SelectionHandler: bring back m_lastSelection attribute
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (145395 => 145396)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2013-03-11 20:22:24 UTC (rev 145395)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2013-03-11 20:40:50 UTC (rev 145396)
@@ -81,7 +81,8 @@
m_scrollPosition = m_webPage->mapToTransformed(view->scrollPosition());
m_contentsSize = m_webPage->mapToTransformed(view->contentsSize());
- m_viewportSize = m_webPage->mapToTransformed(view->visibleContentRect()).size();
+ m_viewportSize = m_webPage->mapToTransformed(view->visibleContentRect(false /*includeScrollbars*/)).size();
+ m_documentViewportRect = view->frameRect();
m_scrollsHorizontally = view->contentsWidth() > view->visibleWidth();
m_scrollsVertically = view->contentsHeight() > view->visibleHeight();
@@ -104,7 +105,8 @@
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()).size();
+ m_viewportSize = m_webPage->mapToTransformed(scrollableArea->visibleContentRect(false /*includeScrollbars*/)).size();
+ m_documentViewportRect = enclosingIntRect(box->absoluteClippedOverflowRect());
m_scrollsHorizontally = box->scrollWidth() != box->clientWidth();
m_scrollsVertically = box->scrollHeight() != box->clientHeight();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
