Title: [144709] trunk/Source/WebCore
- Revision
- 144709
- Author
- [email protected]
- Date
- 2013-03-04 19:17:34 -0800 (Mon, 04 Mar 2013)
Log Message
Revert changes to RenderLayer::scrollByRecursively() that were added for gesture-scrolling
https://bugs.webkit.org/show_bug.cgi?id=111007
Reviewed by Simon Fraser.
Due to http://trac.webkit.org/changeset/144519 landing, the changes made to RenderLayer in
http://trac.webkit.org/changeset/142057,
http://trac.webkit.org/changeset/140177, and
http://trac.webkit.org/changeset/142195
are no longer necessary (as RenderLayer::scrollByRecursively() is not used for
gesture-scrolling) and should be reverted.
No change in behavior, so no new tests needed.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollByRecursively):
* rendering/RenderLayer.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144708 => 144709)
--- trunk/Source/WebCore/ChangeLog 2013-03-05 03:05:27 UTC (rev 144708)
+++ trunk/Source/WebCore/ChangeLog 2013-03-05 03:17:34 UTC (rev 144709)
@@ -1,3 +1,23 @@
+2013-03-04 Terry Anderson <[email protected]>
+
+ Revert changes to RenderLayer::scrollByRecursively() that were added for gesture-scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=111007
+
+ Reviewed by Simon Fraser.
+
+ Due to http://trac.webkit.org/changeset/144519 landing, the changes made to RenderLayer in
+ http://trac.webkit.org/changeset/142057,
+ http://trac.webkit.org/changeset/140177, and
+ http://trac.webkit.org/changeset/142195
+ are no longer necessary (as RenderLayer::scrollByRecursively() is not used for
+ gesture-scrolling) and should be reverted.
+
+ No change in behavior, so no new tests needed.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollByRecursively):
+ * rendering/RenderLayer.h:
+
2013-03-04 Kentaro Hara <[email protected]>
Unreviewed build fix after r144701.
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (144708 => 144709)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-03-05 03:05:27 UTC (rev 144708)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-03-05 03:17:34 UTC (rev 144709)
@@ -2076,13 +2076,8 @@
void RenderLayer::scrollByRecursively(const IntSize& delta, ScrollOffsetClamping clamp)
{
- scrollBy(delta, clamp, ShouldPropagateScroll);
-}
-
-bool RenderLayer::scrollBy(const IntSize& delta, ScrollOffsetClamping clamp, ScrollPropagation shouldPropagate)
-{
if (delta.isZero())
- return false;
+ return;
bool restrictedByLineClamp = false;
if (renderer()->parent())
@@ -2092,36 +2087,24 @@
IntSize newScrollOffset = scrollOffset() + delta;
scrollToOffset(newScrollOffset, clamp);
- if (shouldPropagate == DontPropagateScroll)
- return true;
-
// If this layer can't do the scroll we ask the next layer up that can scroll to try
IntSize remainingScrollOffset = newScrollOffset - scrollOffset();
- bool didScroll = true;
if (!remainingScrollOffset.isZero() && renderer()->parent()) {
if (RenderLayer* scrollableLayer = enclosingScrollableLayer())
- didScroll = scrollableLayer->scrollBy(remainingScrollOffset, clamp, shouldPropagate);
+ scrollableLayer->scrollByRecursively(remainingScrollOffset);
Frame* frame = renderer()->frame();
if (frame)
frame->eventHandler()->updateAutoscrollRenderer();
}
- return didScroll;
} else if (renderer()->view()->frameView()) {
// If we are here, we were called on a renderer that can be programmatically scrolled, but doesn't
// have an overflow clip. Which means that it is a document node that can be scrolled.
- FrameView* view = renderer()->view()->frameView();
- IntPoint scrollPositionBefore = view->scrollPosition();
- if (view->isScrollable())
- view->scrollBy(delta);
- IntPoint scrollPositionAfter = view->scrollPosition();
- return scrollPositionBefore != scrollPositionAfter;
+ renderer()->view()->frameView()->scrollBy(delta);
// FIXME: If we didn't scroll the whole way, do we want to try looking at the frames ownerElement?
// https://bugs.webkit.org/show_bug.cgi?id=28237
}
-
- return false;
}
IntSize RenderLayer::clampScrollOffset(const IntSize& scrollOffset) const
Modified: trunk/Source/WebCore/rendering/RenderLayer.h (144708 => 144709)
--- trunk/Source/WebCore/rendering/RenderLayer.h 2013-03-05 03:05:27 UTC (rev 144708)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2013-03-05 03:17:34 UTC (rev 144709)
@@ -392,13 +392,7 @@
ScrollOffsetClamped
};
- enum ScrollPropagation {
- ShouldPropagateScroll,
- DontPropagateScroll
- };
-
// Scrolling methods for layers that can scroll their overflow.
- bool scrollBy(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped, ScrollPropagation = DontPropagateScroll);
void scrollByRecursively(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped);
void scrollToOffset(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped);
void scrollToXOffset(int x, ScrollOffsetClamping clamp = ScrollOffsetUnclamped) { scrollToOffset(IntSize(x, scrollYOffset()), clamp); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
