Commit bb28b975 authored by darin@apple.com's avatar darin@apple.com

2008-06-14 Darin Adler <darin@apple.com>

        - try to fix Windows build

        * WebActionPropertyBag.cpp:
        (WebActionPropertyBag::Read): Use IDOMNode, not IHTMLFormElement.
        * WebFrame.h: Added missing FormState arguments.
        * WebScrollBar.cpp:
        (WebScrollBar::init): Use create instead of new.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34553 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6c46d604
2008-06-14 Darin Adler <darin@apple.com>
- try to fix Windows build
* WebActionPropertyBag.cpp:
(WebActionPropertyBag::Read): Use IDOMNode, not IHTMLFormElement.
* WebFrame.h: Added missing FormState arguments.
* WebScrollBar.cpp:
(WebScrollBar::init): Use create instead of new.
2008-06-14 Darin Adler <darin@apple.com>
Reviewed by Sam.
......
......@@ -25,11 +25,12 @@
#include "config.h"
#include "WebKitDLL.h"
#include "WebKit.h"
#include "WebActionPropertyBag.h"
#include "WebElementPropertyBag.h"
#include "COMPtr.h"
#include "DOMCoreClasses.h"
#include "WebElementPropertyBag.h"
#include "WebKit.h"
#pragma warning(push, 0)
#include <WebCore/BString.h>
......@@ -155,7 +156,7 @@ HRESULT STDMETHODCALLTYPE WebActionPropertyBag::Read(LPCOLESTR pszPropName, VARI
}
}
if (isEqual(pszPropName, WebActionFormKey)) {
IHTMLFormElement* form = HTMLFormElement::createInstance(m_form.get());
IDOMNode* form = DOMNode::createInstance(m_form.get());
V_VT(pVar) = VT_UNKNOWN;
V_UNKNOWN(pVar) = form;
return S_OK;
......
......@@ -257,8 +257,8 @@ public:
virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
virtual bool shouldFallBack(const WebCore::ResourceError&);
virtual void dispatchDecidePolicyForMIMEType(WebCore::FramePolicyFunction, const WebCore::String& MIMEType, const WebCore::ResourceRequest&);
virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, const WebCore::String& frameName);
virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&);
virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, const WebCore::String& frameName, PassRefPtr<WebCore::FormState>);
virtual void dispatchDecidePolicyForNavigationAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>);
virtual void dispatchUnableToImplementPolicy(const WebCore::ResourceError&);
virtual void download(WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
......
......@@ -98,7 +98,7 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::init(
ScrollbarOrientation webCoreOrientation = (ScrollbarOrientation) orientation;
ScrollbarControlSize webCoreControlSize = (ScrollbarControlSize) controlSize;
m_delegate = delegate;
m_scrollBar = new PlatformScrollbar(this, webCoreOrientation, webCoreControlSize);
m_scrollBar = PlatformScrollbar::create(this, webCoreOrientation, webCoreControlSize);
if (!m_scrollBar)
return E_FAIL;
m_scrollBar->setContainingWindow((HWND)(ULONG64)containingWindow);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment