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

Unified Diff: content/common/frame_owner_properties.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/frame_owner_properties.h ('k') | third_party/WebKit/Source/core/frame/FrameOwner.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/frame_owner_properties.cc
diff --git a/content/common/frame_owner_properties.cc b/content/common/frame_owner_properties.cc
index e84de4237015b817c2b1c0a7cdf7ad24b04befc9..f3de3f0921caee2dca3913804c95f2b2232b11b4 100644
--- a/content/common/frame_owner_properties.cc
+++ b/content/common/frame_owner_properties.cc
@@ -10,7 +10,8 @@ FrameOwnerProperties::FrameOwnerProperties()
: scrolling_mode(blink::WebFrameOwnerProperties::ScrollingMode::Auto),
margin_width(-1),
margin_height(-1),
- allow_fullscreen(false) {}
+ allow_fullscreen(false),
+ allow_payment_request(false) {}
FrameOwnerProperties::FrameOwnerProperties(const FrameOwnerProperties& other) =
default;
@@ -21,6 +22,7 @@ FrameOwnerProperties::FrameOwnerProperties(
margin_width(web_frame_owner_properties.marginWidth),
margin_height(web_frame_owner_properties.marginHeight),
allow_fullscreen(web_frame_owner_properties.allowFullscreen),
+ allow_payment_request(web_frame_owner_properties.allowPaymentRequest),
required_csp(web_frame_owner_properties.requiredCsp.utf8()),
delegated_permissions(
web_frame_owner_properties.delegatedPermissions.begin(),
@@ -36,6 +38,7 @@ blink::WebFrameOwnerProperties FrameOwnerProperties::ToWebFrameOwnerProperties()
result.marginWidth = margin_width;
result.marginHeight = margin_height;
result.allowFullscreen = allow_fullscreen;
+ result.allowPaymentRequest = allow_payment_request;
result.requiredCsp = blink::WebString::fromUTF8(required_csp);
result.delegatedPermissions =
blink::WebVector<blink::WebPermissionType>(delegated_permissions);
@@ -48,6 +51,7 @@ bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const {
margin_width == other.margin_width &&
margin_height == other.margin_height &&
allow_fullscreen == other.allow_fullscreen &&
+ allow_payment_request == other.allow_payment_request &&
required_csp == other.required_csp &&
std::equal(delegated_permissions.begin(), delegated_permissions.end(),
other.delegated_permissions.begin());
« no previous file with comments | « content/common/frame_owner_properties.h ('k') | third_party/WebKit/Source/core/frame/FrameOwner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698