[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:14 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit bb9d4351f059a722deffaf59e6c17ce0a2017562
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 21 04:50:05 2009 +0000
DOMNode::childNodes() is unimplemented
https://bugs.webkit.org/show_bug.cgi?id=31745
Reviewed by Darin Adler.
* DOMCoreClasses.cpp:
(DOMNode::childNodes):
Create a DOMNodeList from the node's child nodes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51279 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 89b46dc..6f7f578 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-20 Jon Honeycutt <jhoneycutt at apple.com>
+
+ DOMNode::childNodes() is unimplemented
+
+ https://bugs.webkit.org/show_bug.cgi?id=31745
+
+ Reviewed by Darin Adler.
+
+ * DOMCoreClasses.cpp:
+ (DOMNode::childNodes):
+ Create a DOMNodeList from the node's child nodes.
+
2009-11-20 Dave Hyatt <hyatt at apple.com>
Reviewed by Jon Honeycutt.
diff --git a/WebKit/win/DOMCoreClasses.cpp b/WebKit/win/DOMCoreClasses.cpp
index f4018c6..4468d47 100644
--- a/WebKit/win/DOMCoreClasses.cpp
+++ b/WebKit/win/DOMCoreClasses.cpp
@@ -150,10 +150,16 @@ HRESULT STDMETHODCALLTYPE DOMNode::parentNode(
}
HRESULT STDMETHODCALLTYPE DOMNode::childNodes(
- /* [retval][out] */ IDOMNodeList** /*result*/)
+ /* [retval][out] */ IDOMNodeList** result)
{
- ASSERT_NOT_REACHED();
- return E_NOTIMPL;
+ if (!m_node)
+ return E_FAIL;
+
+ if (!result)
+ return E_POINTER;
+
+ *result = DOMNodeList::createInstance(m_node->childNodes().get());
+ return *result ? S_OK : E_FAIL;
}
HRESULT STDMETHODCALLTYPE DOMNode::firstChild(
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list