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 "public/platform/WebString.h" |
8 #include "public/platform/WebVector.h" | 9 #include "public/platform/WebVector.h" |
9 #include "public/platform/modules/permissions/WebPermissionType.h" | 10 #include "public/platform/modules/permissions/WebPermissionType.h" |
10 #include <algorithm> | 11 #include <algorithm> |
11 | 12 |
12 namespace blink { | 13 namespace blink { |
13 | 14 |
14 struct WebFrameOwnerProperties { | 15 struct WebFrameOwnerProperties { |
15 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; | 16 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; |
16 | 17 |
17 ScrollingMode scrollingMode; | 18 ScrollingMode scrollingMode; |
18 int marginWidth; | 19 int marginWidth; |
19 int marginHeight; | 20 int marginHeight; |
20 bool allowFullscreen; | 21 bool allowFullscreen; |
| 22 WebString requiredCsp; |
21 WebVector<WebPermissionType> delegatedPermissions; | 23 WebVector<WebPermissionType> delegatedPermissions; |
22 | 24 |
23 WebFrameOwnerProperties() | 25 WebFrameOwnerProperties() |
24 : scrollingMode(ScrollingMode::Auto), | 26 : scrollingMode(ScrollingMode::Auto), |
25 marginWidth(-1), | 27 marginWidth(-1), |
26 marginHeight(-1), | 28 marginHeight(-1), |
27 allowFullscreen(false) {} | 29 allowFullscreen(false) {} |
28 | 30 |
29 #if INSIDE_BLINK | 31 #if INSIDE_BLINK |
30 WebFrameOwnerProperties( | 32 WebFrameOwnerProperties( |
31 ScrollbarMode scrollingMode, | 33 ScrollbarMode scrollingMode, |
32 int marginWidth, | 34 int marginWidth, |
33 int marginHeight, | 35 int marginHeight, |
34 bool allowFullscreen, | 36 bool allowFullscreen, |
| 37 const WebString& requiredCsp, |
35 const WebVector<WebPermissionType>& delegatedPermissions) | 38 const WebVector<WebPermissionType>& delegatedPermissions) |
36 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)), | 39 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)), |
37 marginWidth(marginWidth), | 40 marginWidth(marginWidth), |
38 marginHeight(marginHeight), | 41 marginHeight(marginHeight), |
39 allowFullscreen(allowFullscreen), | 42 allowFullscreen(allowFullscreen), |
| 43 requiredCsp(requiredCsp), |
40 delegatedPermissions(delegatedPermissions) {} | 44 delegatedPermissions(delegatedPermissions) {} |
41 #endif | 45 #endif |
42 }; | 46 }; |
43 | 47 |
44 } // namespace blink | 48 } // namespace blink |
45 | 49 |
46 #endif | 50 #endif |
OLD | NEW |