[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

jhoneycutt at apple.com jhoneycutt at apple.com
Wed Apr 7 23:53:15 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit e645678b4be7dfa12e7a815eaf1c3098ddb02120
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 21 04:50:21 2009 +0000

    DOMElement::tagName() is unimplemented
    
    https://bugs.webkit.org/show_bug.cgi?id=31746
    
    Reviewed by Darin Adler.
    
    * DOMCoreClasses.cpp:
    (DOMElement::tagName):
    Create a BString from the element's tag name, and release its BSTR
    into result.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51280 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 6f7f578..a234a2e 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,18 @@
 2009-11-20  Jon Honeycutt  <jhoneycutt at apple.com>
 
+        DOMElement::tagName() is unimplemented
+
+        https://bugs.webkit.org/show_bug.cgi?id=31746
+
+        Reviewed by Darin Adler.
+
+        * DOMCoreClasses.cpp:
+        (DOMElement::tagName):
+        Create a BString from the element's tag name, and release its BSTR
+        into result.
+
+2009-11-20  Jon Honeycutt  <jhoneycutt at apple.com>
+
         DOMNode::childNodes() is unimplemented
 
         https://bugs.webkit.org/show_bug.cgi?id=31745
diff --git a/WebKit/win/DOMCoreClasses.cpp b/WebKit/win/DOMCoreClasses.cpp
index 4468d47..8ea7c84 100644
--- a/WebKit/win/DOMCoreClasses.cpp
+++ b/WebKit/win/DOMCoreClasses.cpp
@@ -834,10 +834,16 @@ HRESULT STDMETHODCALLTYPE DOMElement::lineBoxRects(
 // IDOMElement ----------------------------------------------------------------
 
 HRESULT STDMETHODCALLTYPE DOMElement::tagName( 
-        /* [retval][out] */ BSTR* /*result*/)
+        /* [retval][out] */ BSTR* result)
 {
-    ASSERT_NOT_REACHED();
-    return E_NOTIMPL;
+    if (!m_element)
+        return E_FAIL;
+
+    if (!result)
+        return E_POINTER;
+
+    *result = BString(m_element->tagName()).release();
+    return S_OK;
 }
     
 HRESULT STDMETHODCALLTYPE DOMElement::getAttribute( 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list