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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit e77ccc20ff397ae137723f21ba6e69de9e6c66e6
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 16 23:59:35 2004 +0000

    	Subresources weren't being archived for LINK tags.
    
            Reviewed by kocienda.
    
            * khtml/xml/dom_nodeimpl.cpp:
            (NodeImpl::recursive_toHTMLWithOptions): indent tweak
            * kwq/DOMHTML.mm:
            (-[DOMHTMLLinkElement _linkElementImpl]): C++ casting voodoo to make methods like rel and href work correctly
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6416 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5a3b989..eb40865 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2004-04-16  Chris Blumenberg  <cblu at apple.com>
+
+	Subresources weren't being archived for LINK tags.
+
+        Reviewed by kocienda.
+
+        * khtml/xml/dom_nodeimpl.cpp:
+        (NodeImpl::recursive_toHTMLWithOptions): indent tweak
+        * kwq/DOMHTML.mm:
+        (-[DOMHTMLLinkElement _linkElementImpl]): C++ casting voodoo to make methods like rel and href work correctly
+
 2004-04-16  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt
diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index bc0c9c5..8e67b47 100644
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -351,8 +351,7 @@ QString NodeImpl::recursive_toHTMLWithOptions(bool start, const DOM::RangeImpl *
                 unsigned long length = attrs->length();
                 for (unsigned int i=0; i<length; i++) {
                     AttributeImpl *attr = attrs->attributeItem(i);
-                    DOMString value = attr->value();
-                    me += " " + getDocument()->attrName(attr->id()).string() + "=\"" + value.string() + "\"";
+                    me += " " + getDocument()->attrName(attr->id()).string() + "=\"" + attr->value().string() + "\"";
                 }
             }
             me += isHTMLElement() ? ">" : "/>";
diff --git a/WebCore/kwq/DOMHTML.mm b/WebCore/kwq/DOMHTML.mm
index a6f8205..9b21e84 100644
--- a/WebCore/kwq/DOMHTML.mm
+++ b/WebCore/kwq/DOMHTML.mm
@@ -490,7 +490,7 @@ using DOM::NodeImpl;
 
 - (HTMLLinkElementImpl *)_linkElementImpl
 {
-    return reinterpret_cast<HTMLLinkElementImpl *>(_internal);
+    return static_cast<HTMLLinkElementImpl *>(reinterpret_cast<HTMLElementImpl *>(_internal));
 }
 
 - (BOOL)disabled

-- 
WebKit Debian packaging