| 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/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 { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; | 15 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; |
| 16 | 16 |
| 17 ScrollingMode scrollingMode; | 17 ScrollingMode scrollingMode; |
| 18 int marginWidth; | 18 int marginWidth; |
| 19 int marginHeight; | 19 int marginHeight; |
| 20 bool allowFullscreen; | 20 bool allowFullscreen; |
| 21 bool allowPaymentRequest; |
| 21 WebVector<WebPermissionType> delegatedPermissions; | 22 WebVector<WebPermissionType> delegatedPermissions; |
| 22 | 23 |
| 23 WebFrameOwnerProperties() | 24 WebFrameOwnerProperties() |
| 24 : scrollingMode(ScrollingMode::Auto), | 25 : scrollingMode(ScrollingMode::Auto), |
| 25 marginWidth(-1), | 26 marginWidth(-1), |
| 26 marginHeight(-1), | 27 marginHeight(-1), |
| 27 allowFullscreen(false) {} | 28 allowFullscreen(false) {} |
| 28 | 29 |
| 29 #if INSIDE_BLINK | 30 #if INSIDE_BLINK |
| 30 WebFrameOwnerProperties( | 31 WebFrameOwnerProperties( |
| 31 ScrollbarMode scrollingMode, | 32 ScrollbarMode scrollingMode, |
| 32 int marginWidth, | 33 int marginWidth, |
| 33 int marginHeight, | 34 int marginHeight, |
| 34 bool allowFullscreen, | 35 bool allowFullscreen, |
| 36 bool allowPaymentRequest, |
| 35 const WebVector<WebPermissionType>& delegatedPermissions) | 37 const WebVector<WebPermissionType>& delegatedPermissions) |
| 36 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)), | 38 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)), |
| 37 marginWidth(marginWidth), | 39 marginWidth(marginWidth), |
| 38 marginHeight(marginHeight), | 40 marginHeight(marginHeight), |
| 39 allowFullscreen(allowFullscreen), | 41 allowFullscreen(allowFullscreen), |
| 42 allowPaymentRequest(allowPaymentRequest), |
| 40 delegatedPermissions(delegatedPermissions) {} | 43 delegatedPermissions(delegatedPermissions) {} |
| 41 #endif | 44 #endif |
| 42 }; | 45 }; |
| 43 | 46 |
| 44 } // namespace blink | 47 } // namespace blink |
| 45 | 48 |
| 46 #endif | 49 #endif |
| OLD | NEW |