Title: [118233] trunk/Source/WebKit/blackberry
- Revision
- 118233
- Author
- [email protected]
- Date
- 2012-05-23 13:30:24 -0700 (Wed, 23 May 2012)
Log Message
Remove minimum and maximum scroll position as they are no
longer required due to changes in ScrollViewBase.
https://bugs.webkit.org/show_bug.cgi?id=87298
Patch by Genevieve Mak <[email protected]> on 2012-05-23
Reviewed by Antonio Gomes.
* WebKitSupport/InRegionScrollableArea.cpp:
(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
* WebKitSupport/InRegionScrollableArea.h:
(InRegionScrollableArea):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (118232 => 118233)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-05-23 20:27:55 UTC (rev 118232)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-05-23 20:30:24 UTC (rev 118233)
@@ -1,3 +1,16 @@
+2012-05-23 Genevieve Mak <[email protected]>
+
+ Remove minimum and maximum scroll position as they are no
+ longer required due to changes in ScrollViewBase.
+ https://bugs.webkit.org/show_bug.cgi?id=87298
+
+ Reviewed by Antonio Gomes.
+
+ * WebKitSupport/InRegionScrollableArea.cpp:
+ (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+ * WebKitSupport/InRegionScrollableArea.h:
+ (InRegionScrollableArea):
+
2012-05-22 Chris Guan <[email protected]>
[Blackberry]Pages contain video or audio tags should be in pageCache
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (118232 => 118233)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-05-23 20:27:55 UTC (rev 118232)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2012-05-23 20:30:24 UTC (rev 118233)
@@ -70,14 +70,7 @@
m_scrollsHorizontally = view->contentsWidth() > view->visibleWidth();
m_scrollsVertically = view->contentsHeight() > view->visibleHeight();
- m_minimumScrollPosition = m_webPage->mapToTransformed(calculateMinimumScrollPosition(
- view->visibleContentRect().size(),
- 0.0 /*overscrollLimit*/));
- m_maximumScrollPosition = m_webPage->mapToTransformed(calculateMaximumScrollPosition(
- view->visibleContentRect().size(),
- view->contentsSize(),
- 0.0 /*overscrollLimit*/));
-
+ m_overscrollLimitFactor = 0.0; // FIXME eventually support overscroll
} else { // RenderBox-based elements case (scrollable boxes (div's, p's, textarea's, etc)).
RenderBox* box = m_layer->renderBox();
@@ -100,34 +93,10 @@
m_scrollsHorizontally = box->scrollWidth() != box->clientWidth() && box->scrollsOverflowX();
m_scrollsVertically = box->scrollHeight() != box->clientHeight() && box->scrollsOverflowY();
- m_minimumScrollPosition = m_webPage->mapToTransformed(calculateMinimumScrollPosition(
- Platform::IntSize(box->clientWidth(), box->clientHeight()),
- 0.0 /*overscrollLimit*/));
- m_maximumScrollPosition = m_webPage->mapToTransformed(calculateMaximumScrollPosition(
- Platform::IntSize(box->clientWidth(), box->clientHeight()),
- Platform::IntSize(box->scrollWidth(), box->scrollHeight()),
- 0.0 /*overscrollLimit*/));
+ m_overscrollLimitFactor = 0.0; // FIXME eventually support overscroll
}
}
-Platform::IntPoint InRegionScrollableArea::calculateMinimumScrollPosition(const Platform::IntSize& viewportSize, float overscrollLimitFactor) const
-{
- // FIXME: Eventually we should support overscroll like iOS5 does.
- ASSERT(!allowsOverscroll());
-
- return Platform::IntPoint(-(viewportSize.width() * overscrollLimitFactor),
- -(viewportSize.height() * overscrollLimitFactor));
-}
-
-Platform::IntPoint InRegionScrollableArea::calculateMaximumScrollPosition(const Platform::IntSize& viewportSize, const Platform::IntSize& contentsSize, float overscrollLimitFactor) const
-{
- // FIXME: Eventually we should support overscroll like iOS5 does.
- ASSERT(!allowsOverscroll());
-
- return Platform::IntPoint(std::max(contentsSize.width() - viewportSize.width(), 0) + overscrollLimitFactor,
- std::max(contentsSize.height() - viewportSize.height(), 0) + overscrollLimitFactor);
-}
-
RenderLayer* InRegionScrollableArea::layer() const
{
ASSERT(!m_isNull);
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.h (118232 => 118233)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.h 2012-05-23 20:27:55 UTC (rev 118232)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.h 2012-05-23 20:30:24 UTC (rev 118233)
@@ -40,9 +40,6 @@
WebCore::RenderLayer* layer() const;
private:
- Platform::IntPoint calculateMinimumScrollPosition(const Platform::IntSize& viewportSize, float overscrollLimitFactor) const;
- Platform::IntPoint calculateMaximumScrollPosition(const Platform::IntSize& viewportSize, const Platform::IntSize& contentsSize, float overscrollLimitFactor) const;
-
WebPagePrivate* m_webPage;
WebCore::RenderLayer* m_layer;
};
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
