| 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 "../platform/WebString.h" |
| 9 #include "../platform/WebVector.h" | 9 #include "../platform/WebVector.h" |
| 10 #include "../platform/modules/permissions/WebPermissionType.h" | 10 #include "../platform/modules/permissions/WebPermissionType.h" |
| 11 #include <algorithm> | 11 #include <algorithm> |
| 12 | 12 |
| 13 namespace blink { | 13 namespace blink { |
| 14 | 14 |
| 15 struct WebFrameOwnerProperties { | 15 struct WebFrameOwnerProperties { |
| 16 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; | 16 enum class ScrollingMode { Auto, AlwaysOff, AlwaysOn, Last = AlwaysOn }; |
| 17 | 17 |
| 18 ScrollingMode scrollingMode; | 18 ScrollingMode scrollingMode; |
| 19 int marginWidth; | 19 int marginWidth; |
| 20 int marginHeight; | 20 int marginHeight; |
| 21 bool allowFullscreen; | 21 bool allowFullscreen; |
| 22 bool allowPaymentRequest; | 22 bool allowPaymentRequest; |
| 23 bool isDisplayNone; |
| 23 WebString requiredCsp; | 24 WebString requiredCsp; |
| 24 WebVector<WebPermissionType> delegatedPermissions; | 25 WebVector<WebPermissionType> delegatedPermissions; |
| 25 | 26 |
| 26 WebFrameOwnerProperties() | 27 WebFrameOwnerProperties() |
| 27 : scrollingMode(ScrollingMode::Auto), | 28 : scrollingMode(ScrollingMode::Auto), |
| 28 marginWidth(-1), | 29 marginWidth(-1), |
| 29 marginHeight(-1), | 30 marginHeight(-1), |
| 30 allowFullscreen(false), | 31 allowFullscreen(false), |
| 31 allowPaymentRequest(false) {} | 32 allowPaymentRequest(false), |
| 33 isDisplayNone(false) {} |
| 32 | 34 |
| 33 #if INSIDE_BLINK | 35 #if INSIDE_BLINK |
| 34 WebFrameOwnerProperties( | 36 WebFrameOwnerProperties( |
| 35 ScrollbarMode scrollingMode, | 37 ScrollbarMode scrollingMode, |
| 36 int marginWidth, | 38 int marginWidth, |
| 37 int marginHeight, | 39 int marginHeight, |
| 38 bool allowFullscreen, | 40 bool allowFullscreen, |
| 39 bool allowPaymentRequest, | 41 bool allowPaymentRequest, |
| 42 bool isDisplayNone, |
| 40 const WebString& requiredCsp, | 43 const WebString& requiredCsp, |
| 41 const WebVector<WebPermissionType>& delegatedPermissions) | 44 const WebVector<WebPermissionType>& delegatedPermissions) |
| 42 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)), | 45 : scrollingMode(static_cast<ScrollingMode>(scrollingMode)), |
| 43 marginWidth(marginWidth), | 46 marginWidth(marginWidth), |
| 44 marginHeight(marginHeight), | 47 marginHeight(marginHeight), |
| 45 allowFullscreen(allowFullscreen), | 48 allowFullscreen(allowFullscreen), |
| 46 allowPaymentRequest(allowPaymentRequest), | 49 allowPaymentRequest(allowPaymentRequest), |
| 50 isDisplayNone(isDisplayNone), |
| 47 requiredCsp(requiredCsp), | 51 requiredCsp(requiredCsp), |
| 48 delegatedPermissions(delegatedPermissions) {} | 52 delegatedPermissions(delegatedPermissions) {} |
| 49 #endif | 53 #endif |
| 50 }; | 54 }; |
| 51 | 55 |
| 52 } // namespace blink | 56 } // namespace blink |
| 53 | 57 |
| 54 #endif | 58 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2564633002:
Don't create layout objects for children of display-none iframes. (Closed)
