Title: [167693] trunk/Source/WebCore
Revision
167693
Author
[email protected]
Date
2014-04-22 18:37:39 -0700 (Tue, 22 Apr 2014)

Log Message

ASSERTION FAILED: scrollerImp == scrollbarPainterForScrollbar(_scrollbar) on two API tests
https://bugs.webkit.org/show_bug.cgi?id=132034
<rdar://problem/16624332>

Reviewed by Simon Fraser.

* platform/mac/ScrollAnimatorMac.mm:
(-[WebScrollbarPainterDelegate shouldUseLayerPerPartForScrollerImp:]):
scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp: moves the delegate
from the old scrollerImp to the new one, and also happens to call shouldUseLayerPerPartForScrollerImp.
Since scrollerImpWithStyle: has not returned yet, the scrollbarPainterForScrollbar still returns the old scrollerImp,
so this assertion fires. It's safe to remove this because supportsUpdateOnSecondaryThread doesn't make use of the imp.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (167692 => 167693)


--- trunk/Source/WebCore/ChangeLog	2014-04-23 00:36:49 UTC (rev 167692)
+++ trunk/Source/WebCore/ChangeLog	2014-04-23 01:37:39 UTC (rev 167693)
@@ -1,3 +1,18 @@
+2014-04-22  Tim Horton  <[email protected]>
+
+        ASSERTION FAILED: scrollerImp == scrollbarPainterForScrollbar(_scrollbar) on two API tests
+        https://bugs.webkit.org/show_bug.cgi?id=132034
+        <rdar://problem/16624332>
+
+        Reviewed by Simon Fraser.
+
+        * platform/mac/ScrollAnimatorMac.mm:
+        (-[WebScrollbarPainterDelegate shouldUseLayerPerPartForScrollerImp:]):
+        scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp: moves the delegate
+        from the old scrollerImp to the new one, and also happens to call shouldUseLayerPerPartForScrollerImp.
+        Since scrollerImpWithStyle: has not returned yet, the scrollbarPainterForScrollbar still returns the old scrollerImp,
+        so this assertion fires. It's safe to remove this because supportsUpdateOnSecondaryThread doesn't make use of the imp.
+
 2014-04-22  Ryosuke Niwa  <[email protected]>
 
         REGRESSION (r157328): popover to check into flight ba.com dismisses instantly when focusing form

Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (167692 => 167693)


--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2014-04-23 00:36:49 UTC (rev 167692)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm	2014-04-23 01:37:39 UTC (rev 167693)
@@ -464,11 +464,11 @@
 
 - (BOOL)shouldUseLayerPerPartForScrollerImp:(id)scrollerImp
 {
+    UNUSED_PARAM(scrollerImp);
+
     if (!_scrollbar)
         return false;
 
-    ASSERT_UNUSED(scrollerImp, scrollerImp == scrollbarPainterForScrollbar(_scrollbar));
-
     return _scrollbar->supportsUpdateOnSecondaryThread();
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to