From c1d734e58b724369357ecd990853e680fcf036b6 Mon Sep 17 00:00:00 2001 From: "darin@apple.com" Date: Fri, 14 Dec 2007 23:41:16 +0000 Subject: [PATCH] Reviewed by Adele. - http://bugs.webkit.org/show_bug.cgi?id=16443 implement some missing Windows WebKit functions * DOMHTMLClasses.cpp: (DOMHTMLDocument::URL): Implemented. * WebActionPropertyBag.cpp: (WebActionPropertyBag::Read): Fixed the WebActionElementKey case. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28725 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebKit/win/ChangeLog | 13 +++++++++++++ WebKit/win/DOMHTMLClasses.cpp | 9 ++++++--- WebKit/win/WebActionPropertyBag.cpp | 5 +---- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog index f24af29d1741..a13cffd52e8f 100644 --- a/WebKit/win/ChangeLog +++ b/WebKit/win/ChangeLog @@ -1,3 +1,16 @@ +2007-12-14 Darin Adler + + Reviewed by Adele. + + - http://bugs.webkit.org/show_bug.cgi?id=16443 + implement some missing Windows WebKit functions + + * DOMHTMLClasses.cpp: + (DOMHTMLDocument::URL): Implemented. + + * WebActionPropertyBag.cpp: + (WebActionPropertyBag::Read): Fixed the WebActionElementKey case. + 2007-12-14 Darin Adler Reviewed by Alexey. diff --git a/WebKit/win/DOMHTMLClasses.cpp b/WebKit/win/DOMHTMLClasses.cpp index 063023feaa98..bfe85282c4dd 100644 --- a/WebKit/win/DOMHTMLClasses.cpp +++ b/WebKit/win/DOMHTMLClasses.cpp @@ -208,10 +208,13 @@ HRESULT STDMETHODCALLTYPE DOMHTMLDocument::domain( } HRESULT STDMETHODCALLTYPE DOMHTMLDocument::URL( - /* [retval][out] */ BSTR* /*result*/) + /* [retval][out] */ BSTR* result) { - ASSERT_NOT_REACHED(); - return E_NOTIMPL; + if (!result) + return E_POINTER; + + *result = BString(static_cast(m_document)->URL()).release(); + return S_OK; } HRESULT STDMETHODCALLTYPE DOMHTMLDocument::body( diff --git a/WebKit/win/WebActionPropertyBag.cpp b/WebKit/win/WebActionPropertyBag.cpp index 1e4994675efb..41f9ccc895b8 100644 --- a/WebKit/win/WebActionPropertyBag.cpp +++ b/WebKit/win/WebActionPropertyBag.cpp @@ -118,11 +118,8 @@ HRESULT STDMETHODCALLTYPE WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARI } else if (isEqual(pszPropName, WebActionElementKey)) { if (const MouseEvent* mouseEvent = findMouseEvent(m_action.event())) { IntPoint point(mouseEvent->clientX(), mouseEvent->clientY()); - COMPtr elementPropertyBag; - elementPropertyBag.adoptRef(WebElementPropertyBag::createInstance(m_frame->eventHandler()->hitTestResultAtPoint(point, false))); - V_VT(pVar) = VT_UNKNOWN; - elementPropertyBag->QueryInterface(IID_IUnknown, (void**)V_UNKNOWNREF(pVar)); + V_UNKNOWN(pVar) = WebElementPropertyBag::createInstance(m_frame->eventHandler()->hitTestResultAtPoint(point, false)); return S_OK; } } else if (isEqual(pszPropName, WebActionButtonKey)) { -- 2.36.0