diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebKit/win/DOMCoreClasses.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebKit/win/DOMCoreClasses.cpp')
| -rw-r--r-- | WebKit/win/DOMCoreClasses.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/WebKit/win/DOMCoreClasses.cpp b/WebKit/win/DOMCoreClasses.cpp index 19f076f..f4018c6 100644 --- a/WebKit/win/DOMCoreClasses.cpp +++ b/WebKit/win/DOMCoreClasses.cpp @@ -101,10 +101,16 @@ HRESULT STDMETHODCALLTYPE DOMNode::QueryInterface(REFIID riid, void** ppvObject) // DOMNode -------------------------------------------------------------------- HRESULT STDMETHODCALLTYPE DOMNode::nodeName( - /* [retval][out] */ BSTR* /*result*/) + /* [retval][out] */ BSTR* result) { - ASSERT_NOT_REACHED(); - return E_NOTIMPL; + if (!result) + return E_POINTER; + + if (!m_node) + return E_FAIL; + + *result = BString(m_node->nodeName()).release(); + return S_OK; } HRESULT STDMETHODCALLTYPE DOMNode::nodeValue( |