Index: content/common/frame_owner_properties.cc |
diff --git a/content/common/frame_owner_properties.cc b/content/common/frame_owner_properties.cc |
index aca8709cbc09885515b032908dd4d6d66bde08d4..9bed940aeb225069b45ef15981bf3f2b8274dd16 100644 |
--- a/content/common/frame_owner_properties.cc |
+++ b/content/common/frame_owner_properties.cc |
@@ -21,6 +21,7 @@ FrameOwnerProperties::FrameOwnerProperties( |
margin_width(web_frame_owner_properties.marginWidth), |
margin_height(web_frame_owner_properties.marginHeight), |
allow_fullscreen(web_frame_owner_properties.allowFullscreen), |
+ csp(web_frame_owner_properties.csp), |
delegated_permissions( |
web_frame_owner_properties.delegatedPermissions.begin(), |
web_frame_owner_properties.delegatedPermissions.end()) {} |
@@ -35,6 +36,7 @@ blink::WebFrameOwnerProperties FrameOwnerProperties::ToWebFrameOwnerProperties() |
result.marginWidth = margin_width; |
result.marginHeight = margin_height; |
result.allowFullscreen = allow_fullscreen; |
+ result.csp = blink::WebString(csp); |
result.delegatedPermissions = |
blink::WebVector<blink::WebPermissionType>(delegated_permissions); |
@@ -45,7 +47,7 @@ bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const { |
return scrolling_mode == other.scrolling_mode && |
margin_width == other.margin_width && |
margin_height == other.margin_height && |
- allow_fullscreen == other.allow_fullscreen && |
+ allow_fullscreen == other.allow_fullscreen && csp == other.csp && |
std::equal(delegated_permissions.begin(), delegated_permissions.end(), |
Mike West
2016/09/29 11:50:14
Is this what `git cl format` gave you?
amalika
2016/09/29 12:56:46
Yep! I checked again and that's what it seems to b
|
other.delegated_permissions.begin()); |
} |