summaryrefslogtreecommitdiff
path: root/chromium/content/common/frame_replication_state.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/common/frame_replication_state.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/common/frame_replication_state.cc')
-rw-r--r--chromium/content/common/frame_replication_state.cc24
1 files changed, 7 insertions, 17 deletions
diff --git a/chromium/content/common/frame_replication_state.cc b/chromium/content/common/frame_replication_state.cc
index 91b740a9adf..3c4e20eabc8 100644
--- a/chromium/content/common/frame_replication_state.cc
+++ b/chromium/content/common/frame_replication_state.cc
@@ -4,20 +4,9 @@
#include "content/common/frame_replication_state.h"
-#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
-#include "third_party/blink/public/mojom/frame/tree_scope_type.mojom.h"
-#include "third_party/blink/public/mojom/security_context/insecure_request_policy.mojom.h"
-
namespace content {
-FrameReplicationState::FrameReplicationState()
- : active_sandbox_flags(network::mojom::WebSandboxFlags::kNone),
- scope(blink::mojom::TreeScopeType::kDocument),
- insecure_request_policy(
- blink::mojom::InsecureRequestPolicy::kLeaveInsecureRequestsAlone),
- has_potentially_trustworthy_unique_origin(false),
- has_received_user_gesture(false),
- has_received_user_gesture_before_nav(false) {}
+FrameReplicationState::FrameReplicationState() = default;
FrameReplicationState::FrameReplicationState(
blink::mojom::TreeScopeType scope,
@@ -26,7 +15,7 @@ FrameReplicationState::FrameReplicationState(
blink::mojom::InsecureRequestPolicy insecure_request_policy,
const std::vector<uint32_t>& insecure_navigations_set,
bool has_potentially_trustworthy_unique_origin,
- bool has_received_user_gesture,
+ bool has_active_user_gesture,
bool has_received_user_gesture_before_nav,
blink::mojom::FrameOwnerElementType owner_type)
: name(name),
@@ -37,15 +26,16 @@ FrameReplicationState::FrameReplicationState(
insecure_navigations_set(insecure_navigations_set),
has_potentially_trustworthy_unique_origin(
has_potentially_trustworthy_unique_origin),
- has_received_user_gesture(has_received_user_gesture),
+ has_active_user_gesture(has_active_user_gesture),
has_received_user_gesture_before_nav(
has_received_user_gesture_before_nav),
frame_owner_element_type(owner_type) {}
+FrameReplicationState::~FrameReplicationState() = default;
+
FrameReplicationState::FrameReplicationState(
const FrameReplicationState& other) = default;
-
-FrameReplicationState::~FrameReplicationState() {
-}
+FrameReplicationState& FrameReplicationState::operator=(
+ const FrameReplicationState& other) = default;
} // namespace content