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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 80e6bf1aa822b8fba2e6b4163e127fa45c9af821
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 5 18:20:36 2004 +0000

            Change by Darin. Reviewed by me.
    
            * kwq/DOM.mm: Fixed the following functions to deal with
            casting objects derived from NodeImpl back and forth to
            NodeImpl given that the derived classes use multiple
            inheritance.
            (-[DOMDocument _documentImpl]):
            (-[DOMCharacterData _characterDataImpl]):
            (-[DOMAttr _attrImpl]):
            (-[DOMElement _elementImpl]):
            (-[DOMText _textImpl]):
            (-[DOMDocumentType _documentTypeImpl]):
            (-[DOMNotation _notationImpl]):
            (-[DOMEntity _entityImpl]):
            (-[DOMProcessingInstruction _processingInstructionImpl]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6175 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 69f9c1c..4301079 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,21 @@
+2004-03-05  Ken Kocienda  <kocienda at apple.com>
+
+        Change by Darin. Reviewed by me.
+
+        * kwq/DOM.mm: Fixed the following functions to deal with
+        casting objects derived from NodeImpl back and forth to
+        NodeImpl given that the derived classes use multiple
+        inheritance.
+        (-[DOMDocument _documentImpl]):
+        (-[DOMCharacterData _characterDataImpl]):
+        (-[DOMAttr _attrImpl]):
+        (-[DOMElement _elementImpl]):
+        (-[DOMText _textImpl]):
+        (-[DOMDocumentType _documentTypeImpl]):
+        (-[DOMNotation _notationImpl]):
+        (-[DOMEntity _entityImpl]):
+        (-[DOMProcessingInstruction _processingInstructionImpl]):
+
 2004-03-03  Darin Adler  <darin at apple.com>
 
         Reviewed by Vicki.
diff --git a/WebCore/kwq/DOM.mm b/WebCore/kwq/DOM.mm
index 4fcb967..3a29825 100644
--- a/WebCore/kwq/DOM.mm
+++ b/WebCore/kwq/DOM.mm
@@ -816,7 +816,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (DocumentImpl *)_documentImpl
 {
-    return reinterpret_cast<DocumentImpl *>(_internal);
+    return static_cast<DocumentImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 - (DOMDocumentType *)doctype
@@ -980,7 +980,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (CharacterDataImpl *)_characterDataImpl
 {
-    return reinterpret_cast<CharacterDataImpl *>(_internal);
+    return static_cast<CharacterDataImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 - (NSString *)data
@@ -1093,7 +1093,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (AttrImpl *)_attrImpl
 {
-    return reinterpret_cast<AttrImpl *>(_internal);
+    return static_cast<AttrImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 @end
@@ -1305,7 +1305,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (ElementImpl *)_elementImpl
 {
-    return reinterpret_cast<ElementImpl *>(_internal);
+    return static_cast<ElementImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 @end
@@ -1317,7 +1317,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (TextImpl *)_textImpl
 {
-    return reinterpret_cast<TextImpl *>(_internal);
+    return static_cast<TextImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 - (DOMText *)splitText:(unsigned long)offset
@@ -1351,7 +1351,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (DocumentTypeImpl *)_documentTypeImpl
 {
-    return reinterpret_cast<DocumentTypeImpl *>(_internal);
+    return static_cast<DocumentTypeImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 - (NSString *)name
@@ -1393,7 +1393,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (NotationImpl *)_notationImpl
 {
-    return reinterpret_cast<NotationImpl *>(_internal);
+    return static_cast<NotationImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 - (NSString *)publicId
@@ -1415,7 +1415,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (EntityImpl *)_entityImpl
 {
-    return reinterpret_cast<EntityImpl *>(_internal);
+    return static_cast<EntityImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 - (NSString *)publicId
@@ -1449,7 +1449,7 @@ inline Document DocumentImpl::createInstance(DocumentImpl *impl)
 
 - (ProcessingInstructionImpl *)_processingInstructionImpl
 {
-    return reinterpret_cast<ProcessingInstructionImpl *>(_internal);
+    return static_cast<ProcessingInstructionImpl *>(reinterpret_cast<NodeImpl *>(_internal));
 }
 
 - (NSString *)target

-- 
WebKit Debian packaging