Title: [151356] trunk/Source/WebCore
- Revision
- 151356
- Author
- [email protected]
- Date
- 2013-06-09 12:52:49 -0700 (Sun, 09 Jun 2013)
Log Message
Scrolling with platformWidget and delegateScrolling is incorrectly clamped
https://bugs.webkit.org/show_bug.cgi?id=117369
<rdar://problem/13985064>
Patch by Benjamin Poulain <[email protected]> on 2013-06-09
Reviewed by Darin Adler.
The patch http://trac.webkit.org/changeset/142526 clamps the input position
in the ScrollView scroll range. This was done for the path to the ScrollingCoordinator.
The problem with that change is ScrollView::setScrollPosition() can delegate the scrolling
to either a platformWidget, or through delegateScrolling. After r142526, the position is clamped,
and we do not let those external scrolling mechanims handle the out-of-bound scrolling.
This patch fixes the issue by moving the threaded scrolling call to ScrollView,
after the delegate handling code.
* page/FrameView.cpp:
(WebCore::FrameView::setScrollPosition):
(WebCore::FrameView::requestScrollPositionUpdate):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (151355 => 151356)
--- trunk/Source/WebCore/ChangeLog 2013-06-09 19:19:11 UTC (rev 151355)
+++ trunk/Source/WebCore/ChangeLog 2013-06-09 19:52:49 UTC (rev 151356)
@@ -1,3 +1,25 @@
+2013-06-09 Benjamin Poulain <[email protected]>
+
+ Scrolling with platformWidget and delegateScrolling is incorrectly clamped
+ https://bugs.webkit.org/show_bug.cgi?id=117369
+ <rdar://problem/13985064>
+
+ Reviewed by Darin Adler.
+
+ The patch http://trac.webkit.org/changeset/142526 clamps the input position
+ in the ScrollView scroll range. This was done for the path to the ScrollingCoordinator.
+
+ The problem with that change is ScrollView::setScrollPosition() can delegate the scrolling
+ to either a platformWidget, or through delegateScrolling. After r142526, the position is clamped,
+ and we do not let those external scrolling mechanims handle the out-of-bound scrolling.
+
+ This patch fixes the issue by moving the threaded scrolling call to ScrollView,
+ after the delegate handling code.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setScrollPosition):
+ (WebCore::FrameView::requestScrollPositionUpdate):
+
2013-06-08 Igor Oliveira <[email protected]>
before/after generated content is not working with HTMLSummaryElement and HTMLDetailsElement.
Modified: trunk/Source/WebCore/page/FrameView.cpp (151355 => 151356)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-06-09 19:19:11 UTC (rev 151355)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-06-09 19:52:49 UTC (rev 151356)
@@ -1901,16 +1901,7 @@
{
TemporaryChange<bool> changeInProgrammaticScroll(m_inProgrammaticScroll, true);
m_maintainScrollPositionAnchor = 0;
-
- IntPoint newScrollPosition = adjustScrollPositionWithinRange(scrollPoint);
-
- if (newScrollPosition == scrollPosition())
- return;
-
- if (requestScrollPositionUpdate(newScrollPosition))
- return;
-
- ScrollView::setScrollPosition(newScrollPosition);
+ ScrollView::setScrollPosition(scrollPoint);
}
void FrameView::delegatesScrollingDidChange()
Modified: trunk/Source/WebCore/platform/ScrollView.cpp (151355 => 151356)
--- trunk/Source/WebCore/platform/ScrollView.cpp 2013-06-09 19:19:11 UTC (rev 151355)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2013-06-09 19:52:49 UTC (rev 151356)
@@ -425,6 +425,9 @@
if (newScrollPosition == scrollPosition())
return;
+ if (requestScrollPositionUpdate(newScrollPosition))
+ return;
+
updateScrollbars(IntSize(newScrollPosition.x(), newScrollPosition.y()));
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes