OLD | NEW |
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 "../platform/WebFeaturePolicy.h" |
8 #include "../platform/WebString.h" | 9 #include "../platform/WebString.h" |
9 #include "../platform/WebVector.h" | 10 #include "../platform/WebVector.h" |
10 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo
m-shared.h" | 11 #include "third_party/WebKit/public/platform/modules/permissions/permission.mojo
m-shared.h" |
11 | 12 |
12 #include <algorithm> | 13 #include <algorithm> |
13 | 14 |
14 namespace blink { | 15 namespace blink { |
15 | 16 |
16 struct WebFrameOwnerProperties { | 17 struct WebFrameOwnerProperties { |
17 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; | 18 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; |
18 | 19 |
19 WebString name; // browsing context container's name | 20 WebString name; // browsing context container's name |
20 ScrollingMode scrollingMode; | 21 ScrollingMode scrollingMode; |
21 int marginWidth; | 22 int marginWidth; |
22 int marginHeight; | 23 int marginHeight; |
23 bool allowFullscreen; | 24 bool allowFullscreen; |
24 bool allowPaymentRequest; | 25 bool allowPaymentRequest; |
25 WebString requiredCsp; | 26 WebString requiredCsp; |
26 WebVector<mojom::PermissionName> delegatedPermissions; | 27 WebVector<mojom::PermissionName> delegatedPermissions; |
27 | 28 |
| 29 public: |
| 30 WebVector<WebFeaturePolicyFeature> allowedFeatures; |
| 31 |
28 WebFrameOwnerProperties() | 32 WebFrameOwnerProperties() |
29 : scrollingMode(ScrollingMode::Auto), | 33 : scrollingMode(ScrollingMode::Auto), |
30 marginWidth(-1), | 34 marginWidth(-1), |
31 marginHeight(-1), | 35 marginHeight(-1), |
32 allowFullscreen(false), | 36 allowFullscreen(false), |
33 allowPaymentRequest(false) {} | 37 allowPaymentRequest(false) {} |
34 | 38 |
35 #if INSIDE_BLINK | 39 #if INSIDE_BLINK |
36 WebFrameOwnerProperties( | 40 WebFrameOwnerProperties( |
37 const WebString& name, | 41 const WebString& name, |
38 ScrollbarMode scrollingMode, | 42 ScrollbarMode scrollingMode, |
39 int marginWidth, | 43 int marginWidth, |
40 int marginHeight, | 44 int marginHeight, |
41 bool allowFullscreen, | 45 bool allowFullscreen, |
42 bool allowPaymentRequest, | 46 bool allowPaymentRequest, |
43 const WebString& requiredCsp, | 47 const WebString& requiredCsp, |
44 const WebVector<mojom::PermissionName>& delegatedPermissions) | 48 const WebVector<mojom::PermissionName>& delegatedPermissions, |
| 49 const WebVector<WebFeaturePolicyFeature>& allowedFeatures) |
45 : name(name), | 50 : name(name), |
46 scrollingMode(static_cast<ScrollingMode>(scrollingMode)), | 51 scrollingMode(static_cast<ScrollingMode>(scrollingMode)), |
47 marginWidth(marginWidth), | 52 marginWidth(marginWidth), |
48 marginHeight(marginHeight), | 53 marginHeight(marginHeight), |
49 allowFullscreen(allowFullscreen), | 54 allowFullscreen(allowFullscreen), |
50 allowPaymentRequest(allowPaymentRequest), | 55 allowPaymentRequest(allowPaymentRequest), |
51 requiredCsp(requiredCsp), | 56 requiredCsp(requiredCsp), |
52 delegatedPermissions(delegatedPermissions) {} | 57 delegatedPermissions(delegatedPermissions), |
| 58 allowedFeatures(allowedFeatures) {} |
53 #endif | 59 #endif |
54 }; | 60 }; |
55 | 61 |
56 } // namespace blink | 62 } // namespace blink |
57 | 63 |
58 #endif | 64 #endif |
OLD | NEW |