[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 eb797f80cf7d89741e10bb46ceb1aed54a2b33e7
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 10 23:37:31 2004 +0000

    	Fix for the bad background color on abcnews.com.  Make cloning optionally drop the style declarations.
    
            * khtml/html/html_elementimpl.cpp:
            (HTMLAttributeImpl::clone):
            * khtml/html/html_elementimpl.h:
            * khtml/html/htmlparser.cpp:
            (KHTMLParser::insertNode):
            * khtml/xml/dom_elementimpl.cpp:
            (AttributeImpl::clone):
            * khtml/xml/dom_elementimpl.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6060 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index abd986d..9954360 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2004-02-10  David Hyatt  <hyatt at apple.com>
+
+	Fix for the bad background color on abcnews.com.  Make cloning optionally drop the style declarations.
+
+        * khtml/html/html_elementimpl.cpp:
+        (HTMLAttributeImpl::clone):
+        * khtml/html/html_elementimpl.h:
+        * khtml/html/htmlparser.cpp:
+        (KHTMLParser::insertNode):
+        * khtml/xml/dom_elementimpl.cpp:
+        (AttributeImpl::clone):
+        * khtml/xml/dom_elementimpl.h:
+
 2004-02-10  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: <rdar://problem/3552545>: Cut, Paste and Delete must support Undo and Redo
diff --git a/WebCore/khtml/html/html_elementimpl.cpp b/WebCore/khtml/html/html_elementimpl.cpp
index 963bd3f..6dd9094 100644
--- a/WebCore/khtml/html/html_elementimpl.cpp
+++ b/WebCore/khtml/html/html_elementimpl.cpp
@@ -118,9 +118,9 @@ HTMLAttributeImpl::~HTMLAttributeImpl()
         m_styleDecl->deref();
 }
 
-AttributeImpl* HTMLAttributeImpl::clone() const
+AttributeImpl* HTMLAttributeImpl::clone(bool preserveDecl) const
 {
-    return new HTMLAttributeImpl(m_id, _value, m_styleDecl);
+    return new HTMLAttributeImpl(m_id, _value, preserveDecl ? m_styleDecl : 0);
 }
 
 HTMLNamedAttrMapImpl::HTMLNamedAttrMapImpl(ElementImpl *e)
diff --git a/WebCore/khtml/html/html_elementimpl.h b/WebCore/khtml/html/html_elementimpl.h
index da161c3..44caa9a 100644
--- a/WebCore/khtml/html/html_elementimpl.h
+++ b/WebCore/khtml/html/html_elementimpl.h
@@ -72,7 +72,7 @@ public:
 
     ~HTMLAttributeImpl();
 
-    virtual AttributeImpl* clone() const;
+    virtual AttributeImpl* clone(bool preserveDecl=true) const;
 
     CSSMappedAttributeDeclarationImpl* decl() const { return m_styleDecl; }
     void setDecl(CSSMappedAttributeDeclarationImpl* decl) 
diff --git a/WebCore/khtml/html/htmlparser.cpp b/WebCore/khtml/html/htmlparser.cpp
index a2d63e6..e739292 100644
--- a/WebCore/khtml/html/htmlparser.cpp
+++ b/WebCore/khtml/html/htmlparser.cpp
@@ -399,7 +399,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
 		    for (unsigned long l = 0; map && l < map->length(); ++l) {
 			AttributeImpl* it = map->attributeItem(l);
 			changed = !bmap->getAttributeItem(it->id());
-			bmap->insertAttribute(it->clone());
+			bmap->insertAttribute(it->clone(false));
 		    }
 		    if ( changed )
 			doc()->recalcStyle( NodeImpl::Inherit );
@@ -445,7 +445,7 @@ bool KHTMLParser::insertNode(NodeImpl *n, bool flat)
                 for (unsigned long l = 0; map && l < map->length(); ++l) {
                     AttributeImpl* it = map->attributeItem(l);
                     changed = !bmap->getAttributeItem(it->id());
-                    bmap->insertAttribute(it->clone());
+                    bmap->insertAttribute(it->clone(false));
                 }
                 if ( changed )
                     doc()->recalcStyle( NodeImpl::Inherit );
diff --git a/WebCore/khtml/xml/dom_elementimpl.cpp b/WebCore/khtml/xml/dom_elementimpl.cpp
index c092540..cd02d66 100644
--- a/WebCore/khtml/xml/dom_elementimpl.cpp
+++ b/WebCore/khtml/xml/dom_elementimpl.cpp
@@ -49,7 +49,7 @@
 using namespace DOM;
 using namespace khtml;
 
-AttributeImpl* AttributeImpl::clone() const
+AttributeImpl* AttributeImpl::clone(bool) const
 {
     AttributeImpl* result = new AttributeImpl(m_id, _value);
     result->setPrefix(_prefix);
diff --git a/WebCore/khtml/xml/dom_elementimpl.h b/WebCore/khtml/xml/dom_elementimpl.h
index 08a5883..00c1538 100644
--- a/WebCore/khtml/xml/dom_elementimpl.h
+++ b/WebCore/khtml/xml/dom_elementimpl.h
@@ -74,7 +74,7 @@ public:
     bool isNull() const { return _value.isNull(); }
     bool isEmpty() const { return _value.isEmpty(); }
     
-    virtual AttributeImpl* clone() const;
+    virtual AttributeImpl* clone(bool preserveDecl=true) const;
 
 private:
     void setValue(const AtomicString& value) {

-- 
WebKit Debian packaging