[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 3311298ddca73f96822cc74a6f681f4ceab60731
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 24 18:31:58 2004 +0000

            Reviewed by me.
    
    	I neglected to check in these required changes when I landed previously.
    	This is what I get for trying to commit when I had other changes in
    	my tree.
    
            * khtml/dom/html_form.cpp:
            (HTMLSelectElement::add): Uses new-style call.
            * khtml/html/html_formimpl.cpp:
            (HTMLSelectElementImpl::add): Change the interface for this call to use
    	impl objects instead of API objects. This works around the fact that the
    	API object's constructor that takes an impl is protected.
            * khtml/html/html_formimpl.h: Uses new-style call.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6252 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0a81e80..48739cb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,19 @@
+2004-03-24  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by me.
+
+	I neglected to check in these required changes when I landed previously.
+	This is what I get for trying to commit when I had other changes in
+	my tree.
+
+        * khtml/dom/html_form.cpp:
+        (HTMLSelectElement::add): Uses new-style call.
+        * khtml/html/html_formimpl.cpp:
+        (HTMLSelectElementImpl::add): Change the interface for this call to use
+	impl objects instead of API objects. This works around the fact that the
+	API object's constructor that takes an impl is protected.
+        * khtml/html/html_formimpl.h: Uses new-style call.
+
 2004-03-24  Ken Kocienda <kocienda at apple.com>
 
         Implemented the remainder of the HTML DOM API.
diff --git a/WebCore/khtml/dom/html_form.cpp b/WebCore/khtml/dom/html_form.cpp
index b97c886..420d953 100644
--- a/WebCore/khtml/dom/html_form.cpp
+++ b/WebCore/khtml/dom/html_form.cpp
@@ -860,7 +860,8 @@ void HTMLSelectElement::setTabIndex( long _tabIndex )
 
 void HTMLSelectElement::add( const HTMLElement &element, const HTMLElement &before )
 {
-    if(impl) static_cast<HTMLSelectElementImpl*>(impl)->add( element, before );
+    if(impl) static_cast<HTMLSelectElementImpl*>(impl)->add( 
+        static_cast<HTMLElementImpl *>(element.handle()), static_cast<HTMLElementImpl *>(before.handle()) );
 }
 
 void HTMLSelectElement::remove( long index )
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index d6da4b4..ff2832b 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -2059,13 +2059,13 @@ long HTMLSelectElementImpl::length() const
     return len;
 }
 
-void HTMLSelectElementImpl::add( const HTMLElement &element, const HTMLElement &before )
+void HTMLSelectElementImpl::add( HTMLElementImpl *element, HTMLElementImpl *before )
 {
-    if(element.isNull() || element.handle()->id() != ID_OPTION)
+    if (!element || element->id() != ID_OPTION)
         return;
 
     int exceptioncode = 0;
-    insertBefore(element.handle(), before.handle(), exceptioncode );
+    insertBefore(element, before, exceptioncode);
     if (!exceptioncode)
         setRecalcListItems();
 }
diff --git a/WebCore/khtml/html/html_formimpl.h b/WebCore/khtml/html/html_formimpl.h
index 407606d..5d2a81f 100644
--- a/WebCore/khtml/html/html_formimpl.h
+++ b/WebCore/khtml/html/html_formimpl.h
@@ -428,7 +428,7 @@ public:
 
     bool multiple() const { return m_multiple; }
 
-    void add ( const HTMLElement &element, const HTMLElement &before );
+    void add ( HTMLElementImpl *element, HTMLElementImpl *before );
     void remove ( long index );
     void blur();
     void focus();

-- 
WebKit Debian packaging