[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 09e81c877fa8472c9607599942e55ee6e7fa067e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 26 06:18:49 2003 +0000

            Reviewed by Trey.
    
            - fixed 3177139 -- REGRESSION: tiny buttons with no text on dbaron test page
    
            This is actually a shortcoming in XML support. The reason it seemed like a regression
            is that this page was parsed as HTML before we had the XML support.
    
            * khtml/xml/xml_tokenizer.cpp:
            (XMLHandler::startElement): As the HTML tokenizer/parser does, call init() on all DOM
            tree elements before calling attach(). The KHTML guys want to get rid of init(), but until
            they do, we need the same thing here as in the HTML version.
            (XMLHandler::startCDATA): Ditto.
            (XMLHandler::enterText): Ditto.
    
            * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode): Fix an obvious editing error that
            would lead to a second attach.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3702 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f5238dd..2254d16 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2003-02-25  Darin Adler  <darin at apple.com>
+
+        Reviewed by Trey.
+        
+        - fixed 3177139 -- REGRESSION: tiny buttons with no text on dbaron test page
+        
+        This is actually a shortcoming in XML support. The reason it seemed like a regression
+        is that this page was parsed as HTML before we had the XML support.
+        
+        * khtml/xml/xml_tokenizer.cpp:
+        (XMLHandler::startElement): As the HTML tokenizer/parser does, call init() on all DOM
+        tree elements before calling attach(). The KHTML guys want to get rid of init(), but until
+        they do, we need the same thing here as in the HTML version.
+        (XMLHandler::startCDATA): Ditto.
+        (XMLHandler::enterText): Ditto.
+
+        * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode): Fix an obvious editing error that
+        would lead to a second attach.
+
 2003-02-25  David Hyatt  <hyatt at apple.com>
 
 	Revert one of my optimizations.  It was bogus.  You can't use
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f5238dd..2254d16 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2003-02-25  Darin Adler  <darin at apple.com>
+
+        Reviewed by Trey.
+        
+        - fixed 3177139 -- REGRESSION: tiny buttons with no text on dbaron test page
+        
+        This is actually a shortcoming in XML support. The reason it seemed like a regression
+        is that this page was parsed as HTML before we had the XML support.
+        
+        * khtml/xml/xml_tokenizer.cpp:
+        (XMLHandler::startElement): As the HTML tokenizer/parser does, call init() on all DOM
+        tree elements before calling attach(). The KHTML guys want to get rid of init(), but until
+        they do, we need the same thing here as in the HTML version.
+        (XMLHandler::startCDATA): Ditto.
+        (XMLHandler::enterText): Ditto.
+
+        * khtml/html/htmlparser.cpp: (KHTMLParser::insertNode): Fix an obvious editing error that
+        would lead to a second attach.
+
 2003-02-25  David Hyatt  <hyatt at apple.com>
 
 	Revert one of my optimizations.  It was bogus.  You can't use
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index 4761e64..7b11912 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -529,9 +529,9 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
                 map->addChild(n);
 #if SPEED_DEBUG < 2
                 if(!n->attached() && HTMLWidget) {
-                    if (!n->attached())
 		    n->init();
-		    n->attach();
+                    if (!n->attached())
+                        n->attach();
 		}
 #endif
                 handled = true;
diff --git a/WebCore/khtml/xml/xml_tokenizer.cpp b/WebCore/khtml/xml/xml_tokenizer.cpp
index 8fed46c..257a528 100644
--- a/WebCore/khtml/xml/xml_tokenizer.cpp
+++ b/WebCore/khtml/xml/xml_tokenizer.cpp
@@ -94,8 +94,11 @@ bool XMLHandler::startElement( const QString& namespaceURI, const QString& /*loc
             return false;
     }
     if (m_currentNode->addChild(newElement)) {
-        if (m_view && !newElement->attached())
-            newElement->attach();
+        if (m_view && !newElement->attached()) {
+            newElement->init();
+            if (!newElement->attached())
+                newElement->attach();
+        }
         m_currentNode = newElement;
         return true;
     }
@@ -131,8 +134,11 @@ bool XMLHandler::startCDATA()
 
     NodeImpl *newNode = m_doc->document()->createCDATASection("");
     if (m_currentNode->addChild(newNode)) {
-        if (m_view && !newNode->attached())
-            newNode->attach();
+        if (m_view && !newNode->attached()) {
+            newNode->init();
+            if (!newNode->attached())
+                newNode->attach();
+        }
         m_currentNode = newNode;
         return true;
     }
@@ -220,8 +226,11 @@ bool XMLHandler::enterText()
 {
     NodeImpl *newNode = m_doc->document()->createTextNode("");
     if (m_currentNode->addChild(newNode)) {
-        if (m_view && !newNode->attached())
-            newNode->attach();
+        if (m_view && !newNode->attached()) {
+            newNode->init();
+            if (!newNode->attached())
+                newNode->attach();
+        }
         m_currentNode = newNode;
         return true;
     }

-- 
WebKit Debian packaging