Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1062)

Side by Side Diff: content/common/frame_owner_properties.cc

Issue 2775393003: Fix crash in frame owner property replication. (Closed)
Patch Set: Add comment to test file Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/test/data/allowed_frames.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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),
11 margin_width(-1), 11 margin_width(-1),
12 margin_height(-1), 12 margin_height(-1),
13 allow_fullscreen(false), 13 allow_fullscreen(false),
14 allow_payment_request(false), 14 allow_payment_request(false),
15 is_display_none(false) {} 15 is_display_none(false) {}
16 16
17 FrameOwnerProperties::FrameOwnerProperties(const FrameOwnerProperties& other) = 17 FrameOwnerProperties::FrameOwnerProperties(const FrameOwnerProperties& other) =
18 default; 18 default;
19 19
20 FrameOwnerProperties::~FrameOwnerProperties() {} 20 FrameOwnerProperties::~FrameOwnerProperties() {}
21 21
22 bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const { 22 bool FrameOwnerProperties::operator==(const FrameOwnerProperties& other) const {
23 return name == other.name && scrolling_mode == other.scrolling_mode && 23 return name == other.name && scrolling_mode == other.scrolling_mode &&
24 margin_width == other.margin_width && 24 margin_width == other.margin_width &&
25 margin_height == other.margin_height && 25 margin_height == other.margin_height &&
26 allow_fullscreen == other.allow_fullscreen && 26 allow_fullscreen == other.allow_fullscreen &&
27 allow_payment_request == other.allow_payment_request && 27 allow_payment_request == other.allow_payment_request &&
28 is_display_none == other.is_display_none && 28 is_display_none == other.is_display_none &&
29 required_csp == other.required_csp && 29 required_csp == other.required_csp &&
30 std::equal(allowed_features.begin(), allowed_features.end(), 30 allowed_features == other.allowed_features;
31 other.allowed_features.begin());
32 } 31 }
33 32
34 } // namespace content 33 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/test/data/allowed_frames.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698