Title: [102478] trunk/Source/WebCore
- Revision
- 102478
- Author
- ander...@apple.com
- Date
- 2011-12-09 15:21:10 -0800 (Fri, 09 Dec 2011)
Log Message
Fix assertion failure in ScrollAnimatorMac
https://bugs.webkit.org/show_bug.cgi?id=74222
Reviewed by Andreas Kling.
* platform/mac/ScrollAnimatorMac.mm:
(-[WebScrollbarPainterControllerDelegate scrollerImpPair:convertContentPoint:toScrollerImp:]):
This can be called with a nil scrollerImp, just return NSZeroPoint when that happens.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102477 => 102478)
--- trunk/Source/WebCore/ChangeLog 2011-12-09 22:48:16 UTC (rev 102477)
+++ trunk/Source/WebCore/ChangeLog 2011-12-09 23:21:10 UTC (rev 102478)
@@ -1,5 +1,16 @@
2011-12-09 Anders Carlsson <ander...@apple.com>
+ Fix assertion failure in ScrollAnimatorMac
+ https://bugs.webkit.org/show_bug.cgi?id=74222
+
+ Reviewed by Andreas Kling.
+
+ * platform/mac/ScrollAnimatorMac.mm:
+ (-[WebScrollbarPainterControllerDelegate scrollerImpPair:convertContentPoint:toScrollerImp:]):
+ This can be called with a nil scrollerImp, just return NSZeroPoint when that happens.
+
+2011-12-09 Anders Carlsson <ander...@apple.com>
+
Move the "is currently drawing into layer" flag out into ScrollbarThemeMac
https://bugs.webkit.org/show_bug.cgi?id=74217
Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (102477 => 102478)
--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-12-09 22:48:16 UTC (rev 102477)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm 2011-12-09 23:21:10 UTC (rev 102478)
@@ -229,7 +229,8 @@
- (NSPoint)scrollerImpPair:(id)scrollerImpPair convertContentPoint:(NSPoint)pointInContentArea toScrollerImp:(id)scrollerImp
{
UNUSED_PARAM(scrollerImpPair);
- if (!_scrollableArea)
+
+ if (!_scrollableArea || !scrollerImp)
return NSZeroPoint;
WebCore::Scrollbar* scrollbar = 0;
@@ -244,7 +245,7 @@
// of the clean-up work in ScrollbarThemeMac::unregisterScrollbar() to avoid this
// issue.
if (!scrollbar)
- return WebCore::IntPoint();
+ return NSZeroPoint;
ASSERT(scrollerImp == scrollbarPainterForScrollbar(scrollbar));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
