Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 #include "config.h" | 32 #include "config.h" |
| 33 #include "FrameLoaderClientImpl.h" | 33 #include "FrameLoaderClientImpl.h" |
| 34 | 34 |
| 35 #include "HTMLNames.h" | 35 #include "HTMLNames.h" |
| 36 #include "RuntimeEnabledFeatures.h" | 36 #include "RuntimeEnabledFeatures.h" |
| 37 #include "SharedWorkerRepositoryClientImpl.h" | 37 #include "SharedWorkerRepositoryClientImpl.h" |
| 38 #include "WebAutocompleteParams.h" | |
| 38 #include "WebAutofillClient.h" | 39 #include "WebAutofillClient.h" |
| 39 #include "WebCachedURLRequest.h" | 40 #include "WebCachedURLRequest.h" |
| 40 #include "WebDOMEvent.h" | 41 #include "WebDOMEvent.h" |
| 41 #include "WebDataSourceImpl.h" | 42 #include "WebDataSourceImpl.h" |
| 42 #include "WebDevToolsAgentPrivate.h" | 43 #include "WebDevToolsAgentPrivate.h" |
| 43 #include "WebDocument.h" | 44 #include "WebDocument.h" |
| 44 #include "WebFormElement.h" | 45 #include "WebFormElement.h" |
| 45 #include "WebFrameClient.h" | 46 #include "WebFrameClient.h" |
| 46 #include "WebFrameImpl.h" | 47 #include "WebFrameImpl.h" |
| 47 #include "WebNode.h" | 48 #include "WebNode.h" |
| 48 #include "WebPermissionClient.h" | 49 #include "WebPermissionClient.h" |
| 49 #include "WebPlugin.h" | 50 #include "WebPlugin.h" |
| 50 #include "WebPluginContainerImpl.h" | 51 #include "WebPluginContainerImpl.h" |
| 51 #include "WebPluginLoadObserver.h" | 52 #include "WebPluginLoadObserver.h" |
| 52 #include "WebPluginParams.h" | 53 #include "WebPluginParams.h" |
| 53 #include "WebSecurityOrigin.h" | 54 #include "WebSecurityOrigin.h" |
| 54 #include "WebViewClient.h" | 55 #include "WebViewClient.h" |
| 55 #include "WebViewImpl.h" | 56 #include "WebViewImpl.h" |
| 57 #include "bindings/v8/Dictionary.h" | |
| 56 #include "bindings/v8/ScriptController.h" | 58 #include "bindings/v8/ScriptController.h" |
| 57 #include "core/dom/Document.h" | 59 #include "core/dom/Document.h" |
| 58 #include "core/dom/DocumentFullscreen.h" | 60 #include "core/dom/DocumentFullscreen.h" |
| 59 #include "core/events/MessageEvent.h" | 61 #include "core/events/MessageEvent.h" |
| 60 #include "core/events/MouseEvent.h" | 62 #include "core/events/MouseEvent.h" |
| 61 #include "core/dom/WheelController.h" | 63 #include "core/dom/WheelController.h" |
| 62 #include "core/html/HTMLAppletElement.h" | 64 #include "core/html/HTMLAppletElement.h" |
| 63 #include "core/loader/DocumentLoader.h" | 65 #include "core/loader/DocumentLoader.h" |
| 64 #include "core/loader/FrameLoadRequest.h" | 66 #include "core/loader/FrameLoadRequest.h" |
| 65 #include "core/loader/FrameLoader.h" | 67 #include "core/loader/FrameLoader.h" |
| (...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 746 void FrameLoaderClientImpl::dispatchWillOpenSocketStream(SocketStreamHandle* han dle) | 748 void FrameLoaderClientImpl::dispatchWillOpenSocketStream(SocketStreamHandle* han dle) |
| 747 { | 749 { |
| 748 m_webFrame->client()->willOpenSocketStream(SocketStreamHandleInternal::toWeb SocketStreamHandle(handle)); | 750 m_webFrame->client()->willOpenSocketStream(SocketStreamHandleInternal::toWeb SocketStreamHandle(handle)); |
| 749 } | 751 } |
| 750 | 752 |
| 751 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(blink::W ebRTCPeerConnectionHandler* handler) | 753 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(blink::W ebRTCPeerConnectionHandler* handler) |
| 752 { | 754 { |
| 753 m_webFrame->client()->willStartUsingPeerConnectionHandler(webFrame(), handle r); | 755 m_webFrame->client()->willStartUsingPeerConnectionHandler(webFrame(), handle r); |
| 754 } | 756 } |
| 755 | 757 |
| 756 void FrameLoaderClientImpl::didRequestAutocomplete(HTMLFormElement* form) | 758 void FrameLoaderClientImpl::didRequestAutocomplete(HTMLFormElement* form, const WebCore::Dictionary& details) |
| 757 { | 759 { |
| 758 if (m_webFrame->viewImpl() && m_webFrame->viewImpl()->autofillClient()) | 760 if (m_webFrame->viewImpl() && m_webFrame->viewImpl()->autofillClient()) |
| 759 m_webFrame->viewImpl()->autofillClient()->didRequestAutocomplete(m_webFr ame, WebFormElement(form)); | 761 m_webFrame->viewImpl()->autofillClient()->didRequestAutocomplete(WebForm Element(form), WebAutocompleteParams(details)); |
|
Evan Stade
2014/03/27 21:51:51
The reason I wrapped it here was to match the othe
abarth-chromium
2014/03/27 23:03:52
This seems fine to me. If you do it before callin
| |
| 760 } | 762 } |
| 761 | 763 |
| 762 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) | 764 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) |
| 763 { | 765 { |
| 764 if (m_webFrame->client()) | 766 if (m_webFrame->client()) |
| 765 return m_webFrame->client()->allowWebGL(m_webFrame, enabledPerSettings); | 767 return m_webFrame->client()->allowWebGL(m_webFrame, enabledPerSettings); |
| 766 | 768 |
| 767 return enabledPerSettings; | 769 return enabledPerSettings; |
| 768 } | 770 } |
| 769 | 771 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 801 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame, client)); | 803 return adoptPtr(m_webFrame->client()->createApplicationCacheHost(m_webFrame, client)); |
| 802 } | 804 } |
| 803 | 805 |
| 804 void FrameLoaderClientImpl::didStopAllLoaders() | 806 void FrameLoaderClientImpl::didStopAllLoaders() |
| 805 { | 807 { |
| 806 if (m_webFrame->client()) | 808 if (m_webFrame->client()) |
| 807 m_webFrame->client()->didAbortLoading(m_webFrame); | 809 m_webFrame->client()->didAbortLoading(m_webFrame); |
| 808 } | 810 } |
| 809 | 811 |
| 810 } // namespace blink | 812 } // namespace blink |
| OLD | NEW |