[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 095f252d2bf3881de3b6360ecf3579a50c94db2a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 16 05:08:16 2004 +0000

            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: http://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 bb9bc82..6ceb9f8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-03-15  Maciej Stachowiak  <mjs at 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 at apple.com>
 
         Reviewed by John
diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index f0f181e..8aaca68 100644
--- 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.

-- 
WebKit Debian packaging