Title: [158140] branches/safari-537.73-branch/Source/WebKit/win
- Revision
- 158140
- Author
- [email protected]
- Date
- 2013-10-28 15:22:51 -0700 (Mon, 28 Oct 2013)
Log Message
Merged r156433. <rdar://problem/15109489>
Modified Paths
Diff
Modified: branches/safari-537.73-branch/Source/WebKit/win/ChangeLog (158139 => 158140)
--- branches/safari-537.73-branch/Source/WebKit/win/ChangeLog 2013-10-28 22:20:44 UTC (rev 158139)
+++ branches/safari-537.73-branch/Source/WebKit/win/ChangeLog 2013-10-28 22:22:51 UTC (rev 158140)
@@ -1,5 +1,22 @@
2013-10-28 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-10-28 Lucas Forschler <[email protected]>
+
Merge r156416
2013-09-24 Roger Fong <[email protected]>
Modified: branches/safari-537.73-branch/Source/WebKit/win/WebView.cpp (158139 => 158140)
--- branches/safari-537.73-branch/Source/WebKit/win/WebView.cpp 2013-10-28 22:20:44 UTC (rev 158139)
+++ branches/safari-537.73-branch/Source/WebKit/win/WebView.cpp 2013-10-28 22:22:51 UTC (rev 158140)
@@ -1691,7 +1691,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
