Title: [156275] branches/safari-537.60-branch/Source/WebCore
- Revision
- 156275
- Author
- [email protected]
- Date
- 2013-09-23 10:15:03 -0700 (Mon, 23 Sep 2013)
Log Message
Merged r156223. <rdar://problem/15048898>
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (156274 => 156275)
--- branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-09-23 16:32:18 UTC (rev 156274)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-09-23 17:15:03 UTC (rev 156275)
@@ -1,3 +1,19 @@
+2013-09-23 Lucas Forschler <[email protected]>
+
+ Merge r156223
+
+ 2013-09-20 Alexey Proskuryakov <[email protected]>
+
+ Handle panning gestures messages properly on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=121711
+
+ Follow-up fix: five regression tests started to crash on Mac.
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderLayer.cpp: (WebCore::RenderLayer::scrollByRecursively):
+ Added null checks, not all callers are interested in scrolled view pointer.
+
2013-09-20 Lucas Forschler <[email protected]>
Merge r156219
Modified: branches/safari-537.60-branch/Source/WebCore/rendering/RenderLayer.cpp (156274 => 156275)
--- branches/safari-537.60-branch/Source/WebCore/rendering/RenderLayer.cpp 2013-09-23 16:32:18 UTC (rev 156274)
+++ branches/safari-537.60-branch/Source/WebCore/rendering/RenderLayer.cpp 2013-09-23 17:15:03 UTC (rev 156275)
@@ -2139,7 +2139,8 @@
if (renderer()->hasOverflowClip() && !restrictedByLineClamp) {
IntSize newScrollOffset = scrollOffset() + delta;
scrollToOffset(newScrollOffset, clamp);
- *scrolledView = &renderer().view().frameView();
+ if (scrolledView)
+ *scrolledView = &renderer().view().frameView();
// If this layer can't do the scroll we ask the next layer up that can scroll to try
IntSize remainingScrollOffset = newScrollOffset - scrollOffset();
@@ -2155,7 +2156,8 @@
// 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.
renderer()->view()->frameView()->scrollBy(delta);
- *scrolledView = &renderer().view().frameView();
+ if (scrolledView)
+ *scrolledView = &renderer().view().frameView();
// 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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
