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

Side by Side Diff: third_party/WebKit/public/web/WebFrameOwnerProperties.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WebFrameOwnerProperties_h 5 #ifndef WebFrameOwnerProperties_h
6 #define WebFrameOwnerProperties_h 6 #define WebFrameOwnerProperties_h
7 7
8 #include "public/platform/WebVector.h" 8 #include "public/platform/WebVector.h"
9 #include "public/platform/modules/permissions/WebPermissionType.h" 9 #include "public/platform/modules/permissions/WebPermissionType.h"
10 #include <algorithm> 10 #include <algorithm>
11 11
12 namespace blink { 12 namespace blink {
13 13
14 struct WebFrameOwnerProperties { 14 struct WebFrameOwnerProperties {
15 enum class ScrollingMode { 15 enum class ScrollingMode {
16 Auto, 16 Auto,
17 AlwaysOff, 17 AlwaysOff,
18 AlwaysOn, 18 AlwaysOn,
19 Last = AlwaysOn 19 Last = AlwaysOn
20 }; 20 };
21 21
22 ScrollingMode scrollingMode; 22 ScrollingMode scrollingMode;
23 int marginWidth; 23 int marginWidth;
24 int marginHeight; 24 int marginHeight;
25 bool allowFullscreen; 25 bool allowFullscreen;
26 bool allowVR;
26 WebVector<WebPermissionType> delegatedPermissions; 27 WebVector<WebPermissionType> delegatedPermissions;
27 28
28 WebFrameOwnerProperties() 29 WebFrameOwnerProperties()
29 : scrollingMode(ScrollingMode::Auto) 30 : scrollingMode(ScrollingMode::Auto)
30 , marginWidth(-1) 31 , marginWidth(-1)
31 , marginHeight(-1) 32 , marginHeight(-1)
32 , allowFullscreen(false) 33 , allowFullscreen(false)
34 , allowVR(false)
33 { 35 {
34 } 36 }
35 37
36 #if INSIDE_BLINK 38 #if INSIDE_BLINK
37 WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int ma rginHeight, bool allowFullscreen, const WebVector<WebPermissionType>& delegatedP ermissions) 39 WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int ma rginHeight, bool allowFullscreen, bool allowVR, const WebVector<WebPermissionTyp e>& delegatedPermissions)
38 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)) 40 : scrollingMode(static_cast<ScrollingMode>(scrollingMode))
39 , marginWidth(marginWidth) 41 , marginWidth(marginWidth)
40 , marginHeight(marginHeight) 42 , marginHeight(marginHeight)
41 , allowFullscreen(allowFullscreen) 43 , allowFullscreen(allowFullscreen)
44 , allowVR(allowVR)
42 , delegatedPermissions(delegatedPermissions) 45 , delegatedPermissions(delegatedPermissions)
43 { 46 {
44 } 47 }
45 #endif 48 #endif
46 }; 49 };
47 50
48 } // namespace blink 51 } // namespace blink
49 52
50 #endif 53 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698