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

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

Issue 2394473002: iframes with allowpaymentrequest attribute are allowed to make payment requests. (Closed)
Patch Set: Rebase issues fixed Created 4 years, 2 months 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 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 void FrameLoaderClientImpl::didChangeFrameOwnerProperties( 887 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(
888 HTMLFrameElementBase* frameElement) { 888 HTMLFrameElementBase* frameElement) {
889 if (!m_webFrame->client()) 889 if (!m_webFrame->client())
890 return; 890 return;
891 891
892 m_webFrame->client()->didChangeFrameOwnerProperties( 892 m_webFrame->client()->didChangeFrameOwnerProperties(
893 WebFrame::fromFrame(frameElement->contentFrame()), 893 WebFrame::fromFrame(frameElement->contentFrame()),
894 WebFrameOwnerProperties( 894 WebFrameOwnerProperties(
895 frameElement->scrollingMode(), frameElement->marginWidth(), 895 frameElement->scrollingMode(), frameElement->marginWidth(),
896 frameElement->marginHeight(), frameElement->allowFullscreen(), 896 frameElement->marginHeight(), frameElement->allowFullscreen(),
897 frameElement->csp(), frameElement->delegatedPermissions())); 897 frameElement->allowPaymentRequest(), frameElement->csp(),
pals 2016/10/19 12:53:12 HTMLIFrameElement needs to override allowPaymentRe
haraken 2016/10/19 15:37:56 Can we avoid the override by changing the line to
pals 2016/10/20 09:30:07 Done.
898 frameElement->delegatedPermissions()));
898 } 899 }
899 900
900 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler( 901 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(
901 WebRTCPeerConnectionHandler* handler) { 902 WebRTCPeerConnectionHandler* handler) {
902 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler); 903 m_webFrame->client()->willStartUsingPeerConnectionHandler(handler);
903 } 904 }
904 905
905 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) { 906 bool FrameLoaderClientImpl::allowWebGL(bool enabledPerSettings) {
906 if (m_webFrame->client()) 907 if (m_webFrame->client())
907 return m_webFrame->client()->allowWebGL(enabledPerSettings); 908 return m_webFrame->client()->allowWebGL(enabledPerSettings);
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
991 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { 992 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() {
992 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) 993 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())
993 ->devToolsAgentImpl(); 994 ->devToolsAgentImpl();
994 } 995 }
995 996
996 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 997 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
997 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 998 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
998 } 999 }
999 1000
1000 } // namespace blink 1001 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698