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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107102 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8056f14..f54d169 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-02-08  Anders Carlsson  <andersca@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.bot@gmail.com>
 
         Unreviewed, rolling out r106920, r106924, r106933, r106939,

diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp
index 927a902..4335e26 100644 (file)
--- a/Source/WebCore/page/FrameView.cpp
+++ b/Source/WebCore/page/FrameView.cpp
@@ -2606,7 +2606,9 @@ void FrameView::notifyPageThatContentAreaWillPaint() const
     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();
     }
 }