Title: [156223] trunk/Source/WebCore
- Revision
- 156223
- Author
- [email protected]
- Date
- 2013-09-20 22:35:15 -0700 (Fri, 20 Sep 2013)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (156222 => 156223)
--- trunk/Source/WebCore/ChangeLog 2013-09-21 04:13:52 UTC (rev 156222)
+++ trunk/Source/WebCore/ChangeLog 2013-09-21 05:35:15 UTC (rev 156223)
@@ -1,3 +1,15 @@
+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 Ryosuke Niwa <[email protected]>
Bad cast from CSSInitialValue to CSSValueList
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (156222 => 156223)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-09-21 04:13:52 UTC (rev 156222)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2013-09-21 05:35:15 UTC (rev 156223)
@@ -2178,7 +2178,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();
@@ -2192,7 +2193,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
