Title: [117004] trunk/Source/WebCore
- Revision
- 117004
- Author
- [email protected]
- Date
- 2012-05-14 14:47:48 -0700 (Mon, 14 May 2012)
Log Message
https://bugs.webkit.org/show_bug.cgi?id=86403
ASSERTION FAILED: m_verticalScrollbarPainterDelegate on recent builds
-and corresponding-
<rdar://problem/11448841>
Reviewed by Simon Fraser.
http://trac.webkit.org/changeset/116476 accidentally started calling
these functions for custom scrollbars. This change replaces that
guard.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::destroyScrollbar):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (117003 => 117004)
--- trunk/Source/WebCore/ChangeLog 2012-05-14 21:28:37 UTC (rev 117003)
+++ trunk/Source/WebCore/ChangeLog 2012-05-14 21:47:48 UTC (rev 117004)
@@ -1,3 +1,18 @@
+2012-05-14 Beth Dakin <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=86403
+ ASSERTION FAILED: m_verticalScrollbarPainterDelegate on recent builds
+ -and corresponding-
+ <rdar://problem/11448841>
+
+ Reviewed by Simon Fraser.
+
+ http://trac.webkit.org/changeset/116476 accidentally started calling
+ these functions for custom scrollbars. This change replaces that
+ guard.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::destroyScrollbar):
+
2012-05-14 Simon Fraser <[email protected]>
Remove redundant pixel snapping in calculateCompositedBounds()
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (117003 => 117004)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-05-14 21:28:37 UTC (rev 117003)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-05-14 21:47:48 UTC (rev 117004)
@@ -2211,16 +2211,19 @@
void RenderLayer::destroyScrollbar(ScrollbarOrientation orientation)
{
RefPtr<Scrollbar>& scrollbar = orientation == HorizontalScrollbar ? m_hBar : m_vBar;
- if (scrollbar) {
+ if (!scrollbar)
+ return;
+
+ if (!scrollbar->isCustomScrollbar()) {
if (orientation == HorizontalScrollbar)
willRemoveHorizontalScrollbar(scrollbar.get());
else
willRemoveVerticalScrollbar(scrollbar.get());
+ }
- scrollbar->removeFromParent();
- scrollbar->disconnectFromScrollableArea();
- scrollbar = 0;
- }
+ scrollbar->removeFromParent();
+ scrollbar->disconnectFromScrollableArea();
+ scrollbar = 0;
}
bool RenderLayer::scrollsOverflow() const
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
