[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 602b0f90bd4a3e603dc923d3c5ac9c4b7c9af65c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 22 03:10:12 2003 +0000

            Back out last change, mondo layout regressions.
    
            * khtml/html/html_documentimpl.cpp:
            (HTMLDocumentImpl::close):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3689 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ccb64f3..902850e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2003-02-21  Maciej Stachowiak  <mjs at apple.com>
 
+        Back out last change, mondo layout regressions.
+
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+
+2003-02-21  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Dave.
 
 	- fixed 3167642 - crash in renderArena.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ccb64f3..902850e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2003-02-21  Maciej Stachowiak  <mjs at apple.com>
 
+        Back out last change, mondo layout regressions.
+
+        * khtml/html/html_documentimpl.cpp:
+        (HTMLDocumentImpl::close):
+
+2003-02-21  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Dave.
 
 	- fixed 3167642 - crash in renderArena.
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index 9a9bb6d..61f5cc8 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -331,13 +331,6 @@ void HTMLDocumentImpl::close()
 {
     // First fire the onload.
     bool doload = !parsing() && m_tokenizer;
-
-    // We must clear the tokenizer as early as possible to avoid
-    // re-entering the onload handler. This is done in the base class
-    // call, but now that we call the handler before anything else
-    // instead of last, we have to also do it manually here.
-    delete m_tokenizer;
-    m_tokenizer = 0;
     
     bool wasNotRedirecting = !view() || view()->part()->d->m_scheduledRedirection == noRedirectionScheduled;
     
@@ -359,6 +352,8 @@ void HTMLDocumentImpl::close()
             // 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;
         }

-- 
WebKit Debian packaging