Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 2545693002: Support allowpaymentrequest with out-of-process iframes (Closed)
Patch Set: Fixed the error Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 void FrameLoaderClientImpl::didChangeFrameOwnerProperties( 886 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(
887 HTMLFrameElementBase* frameElement) { 887 HTMLFrameElementBase* frameElement) {
888 if (!m_webFrame->client()) 888 if (!m_webFrame->client())
889 return; 889 return;
890 890
891 m_webFrame->client()->didChangeFrameOwnerProperties( 891 m_webFrame->client()->didChangeFrameOwnerProperties(
892 WebFrame::fromFrame(frameElement->contentFrame()), 892 WebFrame::fromFrame(frameElement->contentFrame()),
893 WebFrameOwnerProperties( 893 WebFrameOwnerProperties(
894 frameElement->scrollingMode(), frameElement->marginWidth(), 894 frameElement->scrollingMode(), frameElement->marginWidth(),
895 frameElement->marginHeight(), frameElement->allowFullscreen(), 895 frameElement->marginHeight(), frameElement->allowFullscreen(),
896 frameElement->csp(), frameElement->delegatedPermissions())); 896 frameElement->allowPaymentRequest(), frameElement->csp(),
897 frameElement->delegatedPermissions()));
897 } 898 }
898 899
899 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler( 900 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(
900 WebRTCPeerConnectionHandler* handler) { 901 WebRTCPeerConnectionHandler* handler) {
901 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); 902 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler);
902 } 903 }
903 904
904 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) { 905 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) {
905 if (m_webFrame->client()) 906 if (m_webFrame->client())
906 return m_webFrame->client()->allowWebGL(enabledPerSettings); 907 return m_webFrame->client()->allowWebGL(enabledPerSettings);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { 991 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() {
991 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) 992 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())
992 ->devToolsAgentImpl(); 993 ->devToolsAgentImpl();
993 } 994 }
994 995
995 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 996 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
996 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 997 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
997 } 998 }
998 999
999 } // namespace blink 1000 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698