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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLIFrameElement.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2009 Ericsson AB. All rights reserved. 7 * Copyright (C) 2009 Ericsson AB. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 } else if (name == referrerpolicyAttr) { 113 } else if (name == referrerpolicyAttr) {
114 m_referrerPolicy = ReferrerPolicyDefault; 114 m_referrerPolicy = ReferrerPolicyDefault;
115 if (!value.isNull()) 115 if (!value.isNull())
116 SecurityPolicy::referrerPolicyFromStringWithLegacyKeywords( 116 SecurityPolicy::referrerPolicyFromStringWithLegacyKeywords(
117 value, &m_referrerPolicy); 117 value, &m_referrerPolicy);
118 } else if (name == allowfullscreenAttr) { 118 } else if (name == allowfullscreenAttr) {
119 bool oldAllowFullscreen = m_allowFullscreen; 119 bool oldAllowFullscreen = m_allowFullscreen;
120 m_allowFullscreen = !value.isNull(); 120 m_allowFullscreen = !value.isNull();
121 if (m_allowFullscreen != oldAllowFullscreen) 121 if (m_allowFullscreen != oldAllowFullscreen)
122 frameOwnerPropertiesChanged(); 122 frameOwnerPropertiesChanged();
123 } else if (name == allowpaymentrequestAttr) {
124 bool oldAllowPaymentRequest = m_allowPaymentRequest;
125 m_allowPaymentRequest = !value.isNull();
126 if (m_allowPaymentRequest != oldAllowPaymentRequest)
127 frameOwnerPropertiesChanged();
123 } else if (name == permissionsAttr) { 128 } else if (name == permissionsAttr) {
124 if (initializePermissionsAttribute()) 129 if (initializePermissionsAttribute())
125 m_permissions->setValue(value); 130 m_permissions->setValue(value);
126 } else if (RuntimeEnabledFeatures::embedderCSPEnforcementEnabled() && 131 } else if (RuntimeEnabledFeatures::embedderCSPEnforcementEnabled() &&
127 name == cspAttr) { 132 name == cspAttr) {
128 // TODO(amalika): add more robust validation of the value 133 // TODO(amalika): add more robust validation of the value
129 if (!value.getString().containsOnlyASCII()) { 134 if (!value.getString().containsOnlyASCII()) {
130 m_csp = nullAtom; 135 m_csp = nullAtom;
131 document().addConsoleMessage(ConsoleMessage::create( 136 document().addConsoleMessage(ConsoleMessage::create(
132 OtherMessageSource, ErrorMessageLevel, 137 OtherMessageSource, ErrorMessageLevel,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 bool HTMLIFrameElement::initializePermissionsAttribute() { 212 bool HTMLIFrameElement::initializePermissionsAttribute() {
208 if (!RuntimeEnabledFeatures::permissionDelegationEnabled()) 213 if (!RuntimeEnabledFeatures::permissionDelegationEnabled())
209 return false; 214 return false;
210 215
211 if (!m_permissions) 216 if (!m_permissions)
212 m_permissions = HTMLIFrameElementPermissions::create(this); 217 m_permissions = HTMLIFrameElementPermissions::create(this);
213 return true; 218 return true;
214 } 219 }
215 220
216 } // namespace blink 221 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLIFrameElement.h ('k') | third_party/WebKit/Source/modules/payments/PaymentRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698