Title: [147936] trunk/Source/WebKit/blackberry
- Revision
- 147936
- Author
- [email protected]
- Date
- 2013-04-08 10:54:03 -0700 (Mon, 08 Apr 2013)
Log Message
[BlackBerry] Force horizontal list to be horizontal scrollable.
https://bugs.webkit.org/show_bug.cgi?id=114173
Patch by Iris Wu <[email protected]> on 2013-04-08
Reviewed by Rob Buis.
Force content to be horizontal/vertical overscrollable if it
scrolls in horizontal/vertical way.
PR 237440
Internally Reviewed by Arvid Nilsson.
* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (147935 => 147936)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-04-08 17:52:05 UTC (rev 147935)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-04-08 17:54:03 UTC (rev 147936)
@@ -1,3 +1,19 @@
+2013-04-08 Iris Wu <[email protected]>
+
+ [BlackBerry] Force horizontal list to be horizontal scrollable.
+ https://bugs.webkit.org/show_bug.cgi?id=114173
+
+ Reviewed by Rob Buis.
+
+ Force content to be horizontal/vertical overscrollable if it
+ scrolls in horizontal/vertical way.
+
+ PR 237440
+ Internally Reviewed by Arvid Nilsson.
+
+ * WebKitSupport/InRegionScrollableArea.cpp:
+ (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+
2013-04-08 Alberto Garcia <[email protected]>
[BlackBerry] WebPage: misc build fixes
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (147935 => 147936)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2013-04-08 17:52:05 UTC (rev 147935)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2013-04-08 17:54:03 UTC (rev 147936)
@@ -127,7 +127,14 @@
// Both caches below are self-exclusive.
if (m_layer->usesCompositedScrolling()) {
- m_forceContentToBeVerticallyScrollable = true;
+ m_forceContentToBeHorizontallyScrollable = m_scrollsHorizontally;
+ m_forceContentToBeVerticallyScrollable = m_scrollsVertically;
+ // Force content to be scrollable even if it doesn't need to scroll in either direction.
+ if (!m_scrollsHorizontally && !m_scrollsVertically)
+ if (box->scrollsOverflowY())
+ m_forceContentToBeVerticallyScrollable = true;
+ else if (box->scrollsOverflowX()) // If it's already forced scrollable vertically, don't force it to scroll horizontally
+ m_forceContentToBeHorizontallyScrollable = true;
m_supportsCompositedScrolling = true;
ASSERT(m_layer->backing()->hasScrollingLayer());
m_camouflagedCompositedScrollableLayer = reinterpret_cast<unsigned>(m_layer->backing()->scrollingContentsLayer()->platformLayer());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
