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

[darin]

The following commit has been merged in the debian/unstable branch:
commit c2f04c2359a424b3f25930643c170fe4dd5589a8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 21 19:09:17 2002 +0000

    	Remove closeEntireTree now that deferred close takes care of that case.
    
            * khtml/html/htmlparser.cpp: (KHTMLParser::startBody):
            * khtml/rendering/render_object.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6615709..6a16434 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-10-21  Darin Adler  <darin at apple.com>
 
+	Remove closeEntireTree now that deferred close takes care of that case.
+
+        * khtml/html/htmlparser.cpp: (KHTMLParser::startBody):
+        * khtml/rendering/render_object.h:
+
+2002-10-21  Darin Adler  <darin at apple.com>
+
 	- fixed 3075041 -- text larger/smaller increment too large when font-size specified as %
 
         * khtml/css/cssstyleselector.cpp: Don't apply the zoom factor to a font size that
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6615709..6a16434 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-10-21  Darin Adler  <darin at apple.com>
 
+	Remove closeEntireTree now that deferred close takes care of that case.
+
+        * khtml/html/htmlparser.cpp: (KHTMLParser::startBody):
+        * khtml/rendering/render_object.h:
+
+2002-10-21  Darin Adler  <darin at apple.com>
+
 	- fixed 3075041 -- text larger/smaller increment too large when font-size specified as %
 
         * khtml/css/cssstyleselector.cpp: Don't apply the zoom factor to a font size that
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6615709..6a16434 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-10-21  Darin Adler  <darin at apple.com>
 
+	Remove closeEntireTree now that deferred close takes care of that case.
+
+        * khtml/html/htmlparser.cpp: (KHTMLParser::startBody):
+        * khtml/rendering/render_object.h:
+
+2002-10-21  Darin Adler  <darin at apple.com>
+
 	- fixed 3075041 -- text larger/smaller increment too large when font-size specified as %
 
         * khtml/css/cssstyleselector.cpp: Don't apply the zoom factor to a font size that
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 039b32d..9b46859 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -1307,13 +1307,6 @@ void KHTMLParser::startBody()
 
     inBody = true;
 
-    // This hack exists only to deal with unsetting the m_blockBidi
-    // bits in RenderFlows.  For more info, see render_object.h, and
-    // look at the closeEntireTree() method.
-    if (!document->document()->haveStylesheetsLoaded() && 
-	document->document()->renderer())
-        document->document()->renderer()->closeEntireTree();
-
     if( isindex ) {
         insertNode( isindex, true /* don't decend into this node */ );
         isindex = 0;
diff --git a/WebCore/khtml/rendering/render_object.h b/WebCore/khtml/rendering/render_object.h
index 8fd023e..1e25d24 100644
--- a/WebCore/khtml/rendering/render_object.h
+++ b/WebCore/khtml/rendering/render_object.h
@@ -171,21 +171,6 @@ public:
 
     void setOverhangingContents(bool p=true);
     
-    // This hack function is only required to clear the m_blockBidi variable
-    // in RenderFlows.  Unless this variable is cleared, inline children are
-    // prevented from laying out.  In the asynchronous stylesheet case, we
-    // don't go through the parser when attaching, so close() doesn't get called.
-    // Therefore blocks end up unwilling to lay out inline children when the
-    // stylesheets finally do come in. -- dwh
-    void closeEntireTree() {
-      RenderObject *child = firstChild();
-      while (child) {
-          child->closeEntireTree();
-          child = child->nextSibling();
-      }
-      close();
-    }
-
     void setLayouted(bool b=true);
         
     // hack to block inline layouts during parsing

-- 
WebKit Debian packaging