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

../win:

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

        - try to fix Windows build, again

        * WebFrame.cpp:
        (WebFrame::dispatchDecidePolicyForNewWindowAction): Fix arguments. Pass form.
        (WebFrame::dispatchDecidePolicyForNavigationAction): Ditto.
        * WebFrame.h: Fix arguments.

../wx:

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

        - try to fix wx build, again

        * WebView.cpp:
        (wxWebView::Create): Use create function instead of new.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@34558 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 099304c2
2008-06-14 Darin Adler <darin@apple.com>
- try to fix Windows build, again
* WebFrame.cpp:
(WebFrame::dispatchDecidePolicyForNewWindowAction): Fix arguments. Pass form.
(WebFrame::dispatchDecidePolicyForNavigationAction): Ditto.
* WebFrame.h: Fix arguments.
2008-06-14 Darin Adler <darin@apple.com>
Rubber stamped by Sam.
- renamed HTMLGenericFormElement to HTMLFormControlElement
* WebFrame.cpp:
(WebFrame::elementWithName):
(WebFrame::controlsInForm):
2008-06-14 Darin Adler <darin@apple.com>
- try to fix Windows build
......
/*
* Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
* Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
......@@ -1361,7 +1361,7 @@ void WebFrame::dispatchDecidePolicyForMIMEType(FramePolicyFunction function, con
(coreFrame->loader()->*function)(PolicyUse);
}
void WebFrame::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const NavigationAction& action, const ResourceRequest& request, const String& frameName, PassRefPtr<FormState> formState)
void WebFrame::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction function, const NavigationAction& action, const ResourceRequest& request, PassRefPtr<FormState> formState, const String& frameName)
{
Frame* coreFrame = core(this);
ASSERT(coreFrame);
......@@ -1371,7 +1371,7 @@ void WebFrame::dispatchDecidePolicyForNewWindowAction(FramePolicyFunction functi
policyDelegate = DefaultPolicyDelegate::sharedInstance();
COMPtr<IWebURLRequest> urlRequest(AdoptCOM, WebMutableURLRequest::createInstance(request));
COMPtr<WebActionPropertyBag> actionInformation(AdoptCOM, WebActionPropertyBag::createInstance(action, coreFrame, formState));
COMPtr<WebActionPropertyBag> actionInformation(AdoptCOM, WebActionPropertyBag::createInstance(action, formState ? formState->form() : 0, coreFrame));
if (SUCCEEDED(policyDelegate->decidePolicyForNewWindowAction(d->webView, actionInformation.get(), urlRequest.get(), BString(frameName), setUpPolicyListener(function).get())))
return;
......@@ -1389,7 +1389,7 @@ void WebFrame::dispatchDecidePolicyForNavigationAction(FramePolicyFunction funct
policyDelegate = DefaultPolicyDelegate::sharedInstance();
COMPtr<IWebURLRequest> urlRequest(AdoptCOM, WebMutableURLRequest::createInstance(request));
COMPtr<WebActionPropertyBag> actionInformation(AdoptCOM, WebActionPropertyBag::createInstance(action, coreFrame, formState));
COMPtr<WebActionPropertyBag> actionInformation(AdoptCOM, WebActionPropertyBag::createInstance(action, formState ? formState->form() : 0, coreFrame));
if (SUCCEEDED(policyDelegate->decidePolicyForNavigationAction(d->webView, actionInformation.get(), urlRequest.get(), this, setUpPolicyListener(function).get())))
return;
......
......@@ -257,7 +257,7 @@ 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, PassRefPtr<WebCore::FormState>);
virtual void dispatchDecidePolicyForNewWindowAction(WebCore::FramePolicyFunction, const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WebCore::String& frameName);
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&);
......
2008-06-14 Darin Adler <darin@apple.com>
- try to fix wx build, again
* WebView.cpp:
(wxWebView::Create): Use create function instead of new.
2008-06-14 Darin Adler <darin@apple.com>
Reviewed by Sam.
......
......@@ -256,8 +256,7 @@ bool wxWebView::Create(wxWindow* parent, int id, const wxPoint& position,
WebCore::FrameLoaderClientWx* loaderClient = new WebCore::FrameLoaderClientWx();
m_impl->frame = new WebCore::Frame(m_impl->page, parentFrame, loaderClient);
m_impl->frame->deref();
m_impl->frame = WebCore::Frame::create(m_impl->page, parentFrame, loaderClient);
loaderClient->setFrame(m_impl->frame.get());
loaderClient->setWebView(this);
......
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