Title: [107102] trunk/Source/WebCore
- Revision
- 107102
- Author
- ander...@apple.com
- Date
- 2012-02-08 10:00:00 -0800 (Wed, 08 Feb 2012)
Log Message
Fix assertion in svg/dom/SVGStyledElement-pendingResource-crash.html
https://bugs.webkit.org/show_bug.cgi?id=78126
Reviewed by Dan Bernstein.
This broke in r106977 when I tried to change an early return into an ASSERT,
so let's bring back the early return.
* page/FrameView.cpp:
(WebCore::FrameView::notifyPageThatContentAreaWillPaint):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (107101 => 107102)
--- trunk/Source/WebCore/ChangeLog 2012-02-08 17:56:22 UTC (rev 107101)
+++ trunk/Source/WebCore/ChangeLog 2012-02-08 18:00:00 UTC (rev 107102)
@@ -1,3 +1,16 @@
+2012-02-08 Anders Carlsson <ander...@apple.com>
+
+ Fix assertion in svg/dom/SVGStyledElement-pendingResource-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=78126
+
+ Reviewed by Dan Bernstein.
+
+ This broke in r106977 when I tried to change an early return into an ASSERT,
+ so let's bring back the early return.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::notifyPageThatContentAreaWillPaint):
+
2012-02-08 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r106920, r106924, r106933, r106939,
Modified: trunk/Source/WebCore/page/FrameView.cpp (107101 => 107102)
--- trunk/Source/WebCore/page/FrameView.cpp 2012-02-08 17:56:22 UTC (rev 107101)
+++ trunk/Source/WebCore/page/FrameView.cpp 2012-02-08 18:00:00 UTC (rev 107102)
@@ -2606,7 +2606,9 @@
for (HashSet<ScrollableArea*>::const_iterator it = m_scrollableAreas->begin(), end = m_scrollableAreas->end(); it != end; ++it) {
ScrollableArea* scrollableArea = *it;
- ASSERT(scrollableArea->isOnActivePage());
+ if (!scrollableArea->isOnActivePage())
+ continue;
+
scrollableArea->contentAreaWillPaint();
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes