Reviewed by Darin.

        Remove incorrect assertion.

        * page/FrameView.cpp: (WebCore::FrameView::setContentsPos):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c1247f8143558cff871d60c7dea325d61dadf634..81c22cb9a4bc5361f2cc52f0d7b9f1e668e69b87 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-14  Adele Peterson  <adele@apple.com>
+
+        Reviewed by Darin.
+
+        Remove incorrect assertion.
+
+        * page/FrameView.cpp: (WebCore::FrameView::setContentsPos):
+
 2007-05-14  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Geoff.

diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 7ead488df68352394eb36eb87a04c56723e901a8..932c055d4bc59de8cf1672b07939adfe979c67dd 100644 (file)
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -613,7 +613,6 @@ void FrameView::scrollRectIntoViewRecursively(const IntRect& r)
 
 void FrameView::setContentsPos(int x, int y)
 {
-    ASSERT(!d->m_inProgrammaticScroll);
     if (frame()->prohibitsScrolling())
         return;
     bool wasInProgrammaticScroll = d->m_inProgrammaticScroll;