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

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index f24af29d17419070cd99c951f6378edac8396dc6..a13cffd52e8f67dbb784d54823f5a1432cc56190 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,16 @@
+2007-12-14  Darin Adler  <darin@apple.com>
+
+        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  <darin@apple.com>
 
         Reviewed by Alexey.

diff --git a/WebKit/win/DOMHTMLClasses.cpp b/WebKit/win/DOMHTMLClasses.cpp
index 063023feaa98c311eac35b61b375733677be7ce2..bfe85282c4dd4a86bcdb1c9610aef0d0e32db468 100644 (file)
--- 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<HTMLDocument*>(m_document)->URL()).release();
+    return S_OK;
 }
     
 HRESULT STDMETHODCALLTYPE DOMHTMLDocument::body( 

diff --git a/WebKit/win/WebActionPropertyBag.cpp b/WebKit/win/WebActionPropertyBag.cpp
index 1e4994675efbc04240e9adb1f8573bba815e4225..41f9ccc895b80ab670778806bac3fe374ed01f37 100644 (file)
--- 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<WebElementPropertyBag> 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)) {