Title: [156502] branches/safari-537.60-branch/Source/WebKit/win
- Revision
- 156502
- Author
- [email protected]
- Date
- 2013-09-26 15:15:25 -0700 (Thu, 26 Sep 2013)
Log Message
Merged r156433. <rdar://problem/15092137>
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebKit/win/ChangeLog (156501 => 156502)
--- branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2013-09-26 22:13:59 UTC (rev 156501)
+++ branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2013-09-26 22:15:25 UTC (rev 156502)
@@ -1,5 +1,22 @@
2013-09-26 Lucas Forschler <[email protected]>
+ Merge r156433
+
+ 2013-09-25 Roger Fong <[email protected]>
+
+ [Windows] Attempting to scroll from a non-scrollable layer results the main document getting scrolled.
+ https://bugs.webkit.org/show_bug.cgi?id=121889.
+ <rdar://problem/15072441>
+
+ Reviewed by Timothy Horton.
+
+ * WebView.cpp:
+ (WebView::gesture):
+ Call scrollByRecursively on the current RenderLayer's enclosingScrollableLayer to make sure that the method
+ doesn't bail early and end up just scrolling the main document instead of the next scrollable layer in the RenderLayer tree.
+
+2013-09-26 Lucas Forschler <[email protected]>
+
Merge r156416
2013-09-24 Roger Fong <[email protected]>
Modified: branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp (156501 => 156502)
--- branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp 2013-09-26 22:13:59 UTC (rev 156501)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp 2013-09-26 22:15:25 UTC (rev 156502)
@@ -1692,7 +1692,7 @@
coreFrame->view()->scrollBy(IntSize(-deltaX, -deltaY));
scrolledArea = coreFrame->view();
} else
- m_gestureTargetNode->renderer()->enclosingLayer()->scrollByRecursively(IntSize(-deltaX, -deltaY), WebCore::RenderLayer::ScrollOffsetClamped, &scrolledArea);
+ m_gestureTargetNode->renderer()->enclosingLayer()->enclosingScrollableLayer()->scrollByRecursively(IntSize(-deltaX, -deltaY), WebCore::RenderLayer::ScrollOffsetClamped, &scrolledArea);
if (!(UpdatePanningFeedbackPtr() && BeginPanningFeedbackPtr() && EndPanningFeedbackPtr())) {
CloseGestureInfoHandlePtr()(gestureHandle);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
