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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit c0f64a89c40c71a3557f8409ab2644e3c62802fc
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 6 23:05:21 2002 +0000

    	Hack to make i-bench paint every fourth page.  We can tune
    	this # as needed.
    
            Reviewed by: darin
    
            * khtml/html/html_documentimpl.cpp:
            (HTMLDocumentImpl::close):
            * khtml/rendering/render_flow.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2961 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e471ae6..970c1cb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-12-06  David Hyatt  <hyatt at apple.com>
+
+	Hack to make i-bench paint every fourth page.  We can tune
+	this # as needed. 
+	
+        Reviewed by: darin
+
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/rendering/render_flow.h:
+
 2002-12-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e471ae6..970c1cb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-12-06  David Hyatt  <hyatt at apple.com>
+
+	Hack to make i-bench paint every fourth page.  We can tune
+	this # as needed. 
+	
+        Reviewed by: darin
+
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+        * khtml/rendering/render_flow.h:
+
 2002-12-06  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index 458c090..3febadd 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -310,13 +310,17 @@ void HTMLDocumentImpl::close()
     if (doload && wasNotRedirecting
             && view() && !view()->part()->d->m_redirectURL.isEmpty() && view()->part()->d->m_delayRedirect == 0
             && m_startTime.elapsed() < 1000) {
-
-        // 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;
+        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;
+        }
     }
                 
     // The initial layout happens here.
diff --git a/WebCore/khtml/rendering/render_flow.h b/WebCore/khtml/rendering/render_flow.h
index cf87348..236c393 100644
--- a/WebCore/khtml/rendering/render_flow.h
+++ b/WebCore/khtml/rendering/render_flow.h
@@ -48,11 +48,20 @@ public:
     virtual ~RenderFlow();
 
     virtual const char *renderName() const 
-    { 
+    {
+        if (isFloating())
+            return "Block (Floating)";
+        if (isPositioned())
+            return "Block (Positioned)";
         if (isAnonymousBox()) 
             return "Block (Anonymous)";
-        if (isInline())
+        if (isInline()) {
+            if (isRelPositioned())
+                return "Inline (Rel Positioned)";
             return "Inline";
+        }
+        if (isRelPositioned())
+            return "Block (Rel Positioned)";
         return "Block";
     };
     

-- 
WebKit Debian packaging