| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "content/common/frame_owner_properties.h" | 5 #include "content/common/frame_owner_properties.h" |
| 6 | 6 |
| 7 namespace content { | 7 namespace content { |
| 8 | 8 |
| 9 FrameOwnerProperties::FrameOwnerProperties() | 9 FrameOwnerProperties::FrameOwnerProperties() |
| 10 : scrolling_mode(blink::WebFrameOwnerProperties::ScrollingMode::Auto), | 10 : scrolling_mode(blink::WebFrameOwnerProperties::ScrollingMode::Auto), |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 blink::WebFrameOwnerProperties result; | 36 blink::WebFrameOwnerProperties result; |
| 37 | 37 |
| 38 result.name = blink::WebString::fromUTF8(name); | 38 result.name = blink::WebString::fromUTF8(name); |
| 39 result.scrollingMode = scrolling_mode; | 39 result.scrollingMode = scrolling_mode; |
| 40 result.marginWidth = margin_width; | 40 result.marginWidth = margin_width; |
| 41 result.marginHeight = margin_height; | 41 result.marginHeight = margin_height; |
| 42 result.allowFullscreen = allow_fullscreen; | 42 result.allowFullscreen = allow_fullscreen; |
| 43 result.allowPaymentRequest = allow_payment_request; | 43 result.allowPaymentRequest = allow_payment_request; |
| 44 result.requiredCsp = blink::WebString::fromUTF8(required_csp); | 44 result.requiredCsp = blink::WebString::fromUTF8(required_csp); |
| 45 result.delegatedPermissions = | 45 result.delegatedPermissions = |
| 46 blink::WebVector<blink::WebPermissionType>(delegated_permissions); | 46 blink::WebVector<blink::mojom::PermissionName>(delegated_permissions); |
| 47 | 47 |
| 48 return result; | 48 return result; |
| 49 } | 49 } |
| 50 | 50 |
| 51 bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const { | 51 bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const { |
| 52 return name == other.name && | 52 return name == other.name && |
| 53 scrolling_mode == other.scrolling_mode && | 53 scrolling_mode == other.scrolling_mode && |
| 54 margin_width == other.margin_width && | 54 margin_width == other.margin_width && |
| 55 margin_height == other.margin_height && | 55 margin_height == other.margin_height && |
| 56 allow_fullscreen == other.allow_fullscreen && | 56 allow_fullscreen == other.allow_fullscreen && |
| 57 allow_payment_request == other.allow_payment_request && | 57 allow_payment_request == other.allow_payment_request && |
| 58 required_csp == other.required_csp && | 58 required_csp == other.required_csp && |
| 59 std::equal(delegated_permissions.begin(), delegated_permissions.end(), | 59 std::equal(delegated_permissions.begin(), delegated_permissions.end(), |
| 60 other.delegated_permissions.begin()); | 60 other.delegated_permissions.begin()); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace content | 63 } // namespace content |
| OLD | NEW |