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

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

Issue 2568123002: [DO NOT SUBMIT] Support allowpaymentrequest with out-of-process iframes (Closed)
Patch Set: 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 880 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 void FrameLoaderClientImpl::didChangeFrameOwnerProperties( 891 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(
892 HTMLFrameElementBase* frameElement) { 892 HTMLFrameElementBase* frameElement) {
893 if (!m_webFrame->client()) 893 if (!m_webFrame->client())
894 return; 894 return;
895 895
896 m_webFrame->client()->didChangeFrameOwnerProperties( 896 m_webFrame->client()->didChangeFrameOwnerProperties(
897 WebFrame::fromFrame(frameElement->contentFrame()), 897 WebFrame::fromFrame(frameElement->contentFrame()),
898 WebFrameOwnerProperties( 898 WebFrameOwnerProperties(
899 frameElement->scrollingMode(), frameElement->marginWidth(), 899 frameElement->scrollingMode(), frameElement->marginWidth(),
900 frameElement->marginHeight(), frameElement->allowFullscreen(), 900 frameElement->marginHeight(), frameElement->allowFullscreen(),
901 frameElement->csp(), frameElement->delegatedPermissions())); 901 frameElement->allowPaymentRequest(), frameElement->csp(),
902 frameElement->delegatedPermissions()));
902 } 903 }
903 904
904 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler( 905 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(
905 WebRTCPeerConnectionHandler* handler) { 906 WebRTCPeerConnectionHandler* handler) {
906 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); 907 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler);
907 } 908 }
908 909
909 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) { 910 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) {
910 if (m_webFrame->client()) 911 if (m_webFrame->client())
911 return m_webFrame->client()->allowWebGL(enabledPerSettings); 912 return m_webFrame->client()->allowWebGL(enabledPerSettings);
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
996 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { 997 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() {
997 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) 998 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())
998 ->devToolsAgentImpl(); 999 ->devToolsAgentImpl();
999 } 1000 }
1000 1001
1001 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 1002 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
1002 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
1003 } 1004 }
1004 1005
1005 } // namespace blink 1006 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/payments/PaymentRequest.cpp ('k') | third_party/WebKit/Source/web/RemoteFrameOwner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698