diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
| commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
| tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp | |
| parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
| download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz | |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp index 49e780baf..7ffe94339 100644 --- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp +++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp @@ -62,6 +62,9 @@ #endif #include "Settings.h" #include "SocketStreamHandleInternal.h" +#if ENABLE(REQUEST_AUTOCOMPLETE) +#include "WebAutofillClient.h" +#endif #include "WebDOMEvent.h" #include "WebDataSourceImpl.h" #include "WebDevToolsAgentPrivate.h" @@ -893,6 +896,9 @@ Frame* FrameLoaderClientImpl::dispatchCreatePage(const NavigationAction& action) ChromeClientImpl* chromeClient = static_cast<ChromeClientImpl*>(m_webFrame->frame()->page()->chrome()->client()); chromeClient->setNewWindowNavigationPolicy(policy); + if (m_webFrame->frame()->settings() && !m_webFrame->frame()->settings()->supportsMultipleWindows()) + return m_webFrame->frame(); + struct WindowFeatures features; Page* newPage = m_webFrame->frame()->page()->chrome()->createWindow( m_webFrame->frame(), FrameLoadRequest(m_webFrame->frame()->document()->securityOrigin()), @@ -1648,5 +1654,12 @@ void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(RTCPeerC } #endif +#if ENABLE(REQUEST_AUTOCOMPLETE) +void FrameLoaderClientImpl::didRequestAutocomplete(PassRefPtr<FormState> formState) +{ + if (m_webFrame->viewImpl() && m_webFrame->viewImpl()->autofillClient()) + m_webFrame->viewImpl()->autofillClient()->didRequestAutocomplete(m_webFrame, WebFormElement(formState->form())); +} +#endif } // namespace WebKit |