Changeset 24630 in webkit

Timestamp:

Jul 25, 2007, 1:54:03 PM (18 years ago)

Author:

adachan

Message:

2007-07-25 Ada Chan <​adachan@apple.com>

Reviewed by Adam and Steve.

Implemented some DOM methods and other fixes for <rdar://problem/5311601>.

• DOMCoreClasses.cpp: (DOMNode::ownerDocument): implemented (DOMDocument::getComputedStyle): get the DOMElement via QueryInterface (DOMElement::QueryInterface):
• DOMHTMLClasses.cpp: (DOMHTMLDocument::body): fixed leak (DOMHTMLFormElement::action): implemented (DOMHTMLFormElement::method): ditto (DOMHTMLInputElement::form): ditto (DOMHTMLTextAreaElement::form): ditto
• Interfaces/DOMHTML.idl: IDOMHTMLInputElement should inherit from IDOMHTMLElement

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• DOMCoreClasses.cpp (modified) (4 diffs)
• DOMHTMLClasses.cpp (modified) (5 diffs)
• Interfaces/DOMHTML.idl (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2007-07-25  Ada Chan  <adachan@apple.com>
+
+        Reviewed by Adam and Steve.
+        
+        Implemented some DOM methods and other fixes for <rdar://problem/5311601>.
+        
+        * DOMCoreClasses.cpp:
+        (DOMNode::ownerDocument): implemented
+        (DOMDocument::getComputedStyle): get the DOMElement via QueryInterface
+        (DOMElement::QueryInterface):
+        * DOMHTMLClasses.cpp:
+        (DOMHTMLDocument::body): fixed leak
+        (DOMHTMLFormElement::action): implemented
+        (DOMHTMLFormElement::method): ditto
+        (DOMHTMLInputElement::form): ditto
+        (DOMHTMLTextAreaElement::form): ditto
+        * Interfaces/DOMHTML.idl: IDOMHTMLInputElement should inherit from IDOMHTMLElement
+
 2007-07-24  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebKit/win/DOMCoreClasses.cpp

@@ -50 +50 @@
 // {79A193A5-D783-4c73-9AD9-D10678B943DE}
 DEFINE_GUID(IID_DOMNode, 0x79a193a5, 0xd783, 0x4c73, 0x9a, 0xd9, 0xd1, 0x6, 0x78, 0xb9, 0x43, 0xde);
+// {3B0C0EFF-478B-4b0b-8290-D2321E08E23E}
+DEFINE_GUID(IID_DOMElement, 0x3b0c0eff, 0x478b, 0x4b0b, 0x82, 0x90, 0xd2, 0x32, 0x1e, 0x8, 0xe2, 0x3e);
 
 using namespace WebCore;
@@ -172 +174 @@
 
 HRESULT STDMETHODCALLTYPE DOMNode::ownerDocument( 
-    /* [retval][out] */ IDOMDocument** /*result*/)
-{
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+    /* [retval][out] */ IDOMDocument** result)
+{
+    if (!result)
+        return E_POINTER;
+    *result = 0;
+    if (!m_node)
+        return E_FAIL;
+    *result = DOMDocument::createInstance(m_node->ownerDocument());
+    return S_OK;
 }
 
@@ -689 +696 @@
         return E_POINTER;
 
-    DOMElement* domEle = static_cast<DOMElement*>(elt);
+    COMPtr<DOMElement> domEle;
+    HRESULT hr = elt->QueryInterface(IID_DOMElement, (void**)&domEle);
+    if (FAILED(hr))
+        return hr;
     Element* element = domEle->element();
 
@@ -755 +765 @@
     if (IsEqualGUID(riid, IID_IDOMElement))
         *ppvObject = static_cast<IDOMElement*>(this);
+    else if (IsEqualGUID(riid, IID_DOMElement))
+        *ppvObject = static_cast<DOMElement*>(this);
     else if (IsEqualGUID(riid, IID_IDOMElementPrivate))
         *ppvObject = static_cast<IDOMElementPrivate*>(this);

trunk/WebKit/win/DOMHTMLClasses.cpp

@@ -222 +222 @@
 
     HTMLDocument* htmlDoc = static_cast<HTMLDocument*>(m_document);
-    COMPtr<IDOMElement> domEle = DOMHTMLElement::createInstance(htmlDoc->body());
-    if (domEle)
-        return domEle->QueryInterface(IID_IDOMHTMLElement, (void**) bodyElement);
+    COMPtr<IDOMElement> domElement;
+    domElement.adoptRef(DOMHTMLElement::createInstance(htmlDoc->body()));
+    if (domElement)
+        return domElement->QueryInterface(IID_IDOMHTMLElement, (void**) bodyElement);
     return E_FAIL;
 }
@@ -510 +511 @@
     
 HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::action( 
-        /* [retval][out] */ BSTR* /*result*/)
-{
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+        /* [retval][out] */ BSTR* result)
+{
+    ASSERT(m_element && m_element->hasTagName(formTag));
+    WebCore::String actionString = static_cast<HTMLFormElement*>(m_element)->action();
+    *result = BString(actionString.characters(), actionString.length()).release();
+    return S_OK;
 }
     
@@ -538 +541 @@
     
 HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::method( 
-        /* [retval][out] */ BSTR* /*method*/)
-{
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+        /* [retval][out] */ BSTR* result)
+{
+    ASSERT(m_element && m_element->hasTagName(formTag));
+    WebCore::String methodString = static_cast<HTMLFormElement*>(m_element)->method();
+    *result = BString(methodString.characters(), methodString.length()).release();
+    return S_OK;
 }
     
@@ -899 +904 @@
     
 HRESULT STDMETHODCALLTYPE DOMHTMLInputElement::form( 
-        /* [retval][out] */ IDOMHTMLElement** /*result*/)
-{
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+        /* [retval][out] */ IDOMHTMLElement** result)
+{
+    if (!result)
+        return E_POINTER;
+    *result = 0;
+    ASSERT(m_element && m_element->hasTagName(inputTag));
+    HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(m_element);
+    COMPtr<IDOMElement> domElement;
+    domElement.adoptRef(DOMHTMLElement::createInstance(inputElement->form()));
+    if (domElement)
+        return domElement->QueryInterface(IID_IDOMHTMLElement, (void**) result);
+    return E_FAIL;
 }
     
@@ -1269 +1282 @@
     
 HRESULT STDMETHODCALLTYPE DOMHTMLTextAreaElement::form( 
-        /* [retval][out] */ IDOMHTMLElement** /*result*/)
-{
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+        /* [retval][out] */ IDOMHTMLElement** result)
+{
+    if (!result)
+        return E_POINTER;
+    *result = 0;
+    ASSERT(m_element && m_element->hasTagName(textareaTag));
+    HTMLTextAreaElement* textareaElement = static_cast<HTMLTextAreaElement*>(m_element);
+    COMPtr<IDOMElement> domElement;
+    domElement.adoptRef(DOMHTMLElement::createInstance(textareaElement->form()));
+    if (domElement)
+        return domElement->QueryInterface(IID_IDOMHTMLElement, (void**) result);
+    return E_FAIL;
 }
     

trunk/WebKit/win/Interfaces/DOMHTML.idl

@@ -612 +612 @@
     pointer_default(unique)
 ]
-interface IDOMHTMLInputElement : IDOMElement
+interface IDOMHTMLInputElement : IDOMHTMLElement
 {
     /*