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

Unified Diff: content/common/frame_owner_properties.cc

Issue 2331223002: Added allowvr attribute to iframes and vrEnabled to Document (Closed)
Patch Set: Rebase and moved vrEnabled from navigator to document Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
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..579d1b23f3e36c2ca11183120017c138375e08df 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_vr(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_vr(web_frame_owner_properties.allowVR),
delegated_permissions(
web_frame_owner_properties.delegatedPermissions.begin(),
web_frame_owner_properties.delegatedPermissions.end()) {}
@@ -35,6 +37,7 @@ blink::WebFrameOwnerProperties FrameOwnerProperties::ToWebFrameOwnerProperties()
result.marginWidth = margin_width;
result.marginHeight = margin_height;
result.allowFullscreen = allow_fullscreen;
+ result.allowVR = allow_vr;
result.delegatedPermissions =
blink::WebVector<blink::WebPermissionType>(delegated_permissions);
@@ -46,6 +49,7 @@ bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const {
margin_width == other.margin_width &&
margin_height == other.margin_height &&
allow_fullscreen == other.allow_fullscreen &&
+ allow_vr == other.allow_vr &&
std::equal(delegated_permissions.begin(), delegated_permissions.end(),
other.delegated_permissions.begin());
}

Powered by Google App Engine
This is Rietveld 408576698