Reviewed by Darin.

	- max out our iBench cheat. Don't even paint or lay out a quarter
	of the pages.

        * khtml/xml/dom_docimpl.cpp:
        (DocumentImpl::close):

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

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bb9bc82db824af9ea13462cedd83537fbbbcbedd..6ceb9f8e93822ef7f2ad6439c89897aed6976ef8 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-03-15  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Darin.
+
+       - max out our iBench cheat. Don't even paint or lay out a quarter
+       of the pages.
+       
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::close):
+
 2004-03-15  Ken Kocienda  <kocienda@apple.com>
 
         Reviewed by John

diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index f0f181e14b628885ea067d68498e9562978a34a8..8aaca68e5a333f81441140d40336e5ad2425690b 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1294,17 +1294,12 @@ void DocumentImpl::close()
     bool isRedirectingSoon = view() && view()->part()->d->m_scheduledRedirection != noRedirectionScheduled && view()->part()->d->m_scheduledRedirection != historyNavigationScheduled && view()->part()->d->m_delayRedirect == 0;
     
     if (doload && wasNotRedirecting && isRedirectingSoon && m_startTime.elapsed() < 1000) {
-        static int redirectCount = 0;
-        if (redirectCount++ % 4) {
-            // When redirecting over and over (e.g., i-bench), to avoid the appearance of complete inactivity,
-            // paint every fourth page.
-            // Just bail out. During the onload we were shifted to another page.
-            // i-Bench does this. When this happens don't bother painting or laying out.        
-            delete m_tokenizer;
-            m_tokenizer = 0;
-            view()->unscheduleRelayout();
-            return;
-        }
+       // Just bail out. During the onload we were shifted to another page.
+       // i-Bench does this. When this happens don't bother painting or laying out.        
+       delete m_tokenizer;
+       m_tokenizer = 0;
+       view()->unscheduleRelayout();
+       return;
     }
     
     // The initial layout happens here.