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/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 { | 16 enum class ScrollingMode { |
16 Auto, | 17 Auto, |
17 AlwaysOff, | 18 AlwaysOff, |
18 AlwaysOn, | 19 AlwaysOn, |
19 Last = AlwaysOn | 20 Last = AlwaysOn |
20 }; | 21 }; |
21 | 22 |
22 ScrollingMode scrollingMode; | 23 ScrollingMode scrollingMode; |
23 int marginWidth; | 24 int marginWidth; |
24 int marginHeight; | 25 int marginHeight; |
25 bool allowFullscreen; | 26 bool allowFullscreen; |
27 WebString csp; | |
26 WebVector<WebPermissionType> delegatedPermissions; | 28 WebVector<WebPermissionType> delegatedPermissions; |
27 | 29 |
28 WebFrameOwnerProperties() | 30 WebFrameOwnerProperties() |
29 : scrollingMode(ScrollingMode::Auto) | 31 : scrollingMode(ScrollingMode::Auto) |
30 , marginWidth(-1) | 32 , marginWidth(-1) |
31 , marginHeight(-1) | 33 , marginHeight(-1) |
32 , allowFullscreen(false) | 34 , allowFullscreen(false) |
35 , csp(WebString()) | |
Mike West
2016/09/29 08:58:53
Default constructor is fine.
| |
33 { | 36 { |
34 } | 37 } |
35 | 38 |
36 #if INSIDE_BLINK | 39 #if INSIDE_BLINK |
37 WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int ma rginHeight, bool allowFullscreen, const WebVector<WebPermissionType>& delegatedP ermissions) | 40 WebFrameOwnerProperties(ScrollbarMode scrollingMode, int marginWidth, int ma rginHeight, bool allowFullscreen, const WebString& csp, const WebVector<WebPermi ssionType>& delegatedPermissions) |
38 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)) | 41 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)) |
39 , marginWidth(marginWidth) | 42 , marginWidth(marginWidth) |
40 , marginHeight(marginHeight) | 43 , marginHeight(marginHeight) |
41 , allowFullscreen(allowFullscreen) | 44 , allowFullscreen(allowFullscreen) |
45 , csp(csp) | |
42 , delegatedPermissions(delegatedPermissions) | 46 , delegatedPermissions(delegatedPermissions) |
43 { | 47 { |
44 } | 48 } |
45 #endif | 49 #endif |
46 }; | 50 }; |
47 | 51 |
48 } // namespace blink | 52 } // namespace blink |
49 | 53 |
50 #endif | 54 #endif |
OLD | NEW |