Index: Source/core/frame/RootFrameViewport.cpp |
diff --git a/Source/core/frame/RootFrameViewport.cpp b/Source/core/frame/RootFrameViewport.cpp |
index 3ba978fd47f6bf304fb7f05ff327a2e0d915b761..24ebc5fb145bf96fefaae18a55fde069e684c6cd 100644 |
--- a/Source/core/frame/RootFrameViewport.cpp |
+++ b/Source/core/frame/RootFrameViewport.cpp |
@@ -96,9 +96,7 @@ ScrollResult RootFrameViewport::handleWheel(const PlatformWheelEvent& event) |
{ |
updateScrollAnimator(); |
- ScrollResult viewScrollResult; |
- if (layoutViewport().isScrollable()) |
- viewScrollResult = layoutViewport().handleWheel(event); |
+ ScrollResult viewScrollResult = layoutViewport().handleWheel(event); |
MuVen
2015/06/25 12:55:51
bokan@, handleWheel should be triggered, irrespect
bokan
2015/06/25 14:54:35
Sounds fine to me - it's actually an improvement -
MuVen
2015/06/25 17:05:36
Done.
|
// The visual viewport will only accept pixel scrolls. |
if (!event.canScroll() || event.granularity() == ScrollByPageWheelEvent) |
@@ -122,7 +120,7 @@ ScrollResult RootFrameViewport::handleWheel(const PlatformWheelEvent& event) |
DoublePoint usedLocationDelta(visualViewport().scrollPositionDouble() - oldOffset); |
if (!viewScrollResult.didScroll() && usedLocationDelta == DoublePoint::zero()) |
- return ScrollResult(); |
+ return ScrollResult(false, false, viewScrollResult.unusedScrollDeltaX - usedLocationDelta.x(), viewScrollResult.unusedScrollDeltaY - usedLocationDelta.y()); |
bokan
2015/06/25 14:54:35
This still looks wrong to me, I think you have the
MuVen
2015/06/25 17:05:36
Done. filed bug @ crbug.com/504389.
|
DoubleSize unusedLocationDelta(locationDelta - usedLocationDelta); |
bool didScrollX = viewScrollResult.didScrollX || unusedLocationDelta.width(); |