Reviewed by Adele.
[WebKit-https.git] / WebKit / win / WebActionPropertyBag.cpp
index 059deaa126f877e964e4f3ff086bb2f38414c204..41f9ccc895b80ab670778806bac3fe374ed01f37 100644 (file)
@@ -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)) {
@@ -133,7 +130,7 @@ HRESULT STDMETHODCALLTYPE WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARI
         }
     } else if (isEqual(pszPropName, WebActionOriginalURLKey)) {
         V_VT(pVar) = VT_BSTR;
-        V_BSTR(pVar) = BString(m_action.URL().url()).release();
+        V_BSTR(pVar) = BString(m_action.url().string()).release();
         return S_OK;
     } else if (isEqual(pszPropName, WebActionModifierFlagsKey)) {
         if (const UIEventWithKeyState* keyEvent = findEventWithKeyState(const_cast<Event*>(m_action.event()))) {