Commit 5761f4c9 authored by arthursonzogni's avatar arthursonzogni Committed by Commit Bot

Cleanup: Move initializations in the declaration.

This is preferred by the style guide:
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++-dos-and-donts.md#initialize-members-in-the-declaration-where-possible

Bug: None
Change-Id: I51d527f6db042e2b3e4efa3bbe8e06af336b5773
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2549861Reviewed-by: default avatarCamille Lamy <clamy@chromium.org>
Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829629}
parent a0baadbb
...@@ -1011,7 +1011,6 @@ NavigationRequest::NavigationRequest( ...@@ -1011,7 +1011,6 @@ NavigationRequest::NavigationRequest(
commit_params_(std::move(commit_params)), commit_params_(std::move(commit_params)),
browser_initiated_(browser_initiated), browser_initiated_(browser_initiated),
navigation_ui_data_(std::move(navigation_ui_data)), navigation_ui_data_(std::move(navigation_ui_data)),
state_(NOT_STARTED),
restore_type_(entry ? entry->restore_type() : RestoreType::NONE), restore_type_(entry ? entry->restore_type() : RestoreType::NONE),
// Some navigations, such as renderer-initiated subframe navigations, // Some navigations, such as renderer-initiated subframe navigations,
// won't have a NavigationEntryImpl. Set |reload_type_| if applicable // won't have a NavigationEntryImpl. Set |reload_type_| if applicable
...@@ -1020,21 +1019,13 @@ NavigationRequest::NavigationRequest( ...@@ -1020,21 +1019,13 @@ NavigationRequest::NavigationRequest(
entry ? entry->reload_type() entry ? entry->reload_type()
: NavigationTypeToReloadType(common_params_->navigation_type)), : NavigationTypeToReloadType(common_params_->navigation_type)),
nav_entry_id_(entry ? entry->GetUniqueID() : 0), nav_entry_id_(entry ? entry->GetUniqueID() : 0),
is_view_source_(false),
bindings_(FrameNavigationEntry::kInvalidBindings), bindings_(FrameNavigationEntry::kInvalidBindings),
response_should_be_rendered_(true),
associated_site_instance_type_(AssociatedSiteInstanceType::NONE),
from_begin_navigation_(from_begin_navigation), from_begin_navigation_(from_begin_navigation),
has_stale_copy_in_cache_(false),
expected_render_process_host_id_(ChildProcessHost::kInvalidUniqueID), expected_render_process_host_id_(ChildProcessHost::kInvalidUniqueID),
initiator_csp_context_(std::make_unique<InitiatorCSPContext>( initiator_csp_context_(std::make_unique<InitiatorCSPContext>(
std::move(common_params_->initiator_csp_info->initiator_csp), std::move(common_params_->initiator_csp_info->initiator_csp),
std::move(common_params_->initiator_csp_info->initiator_self_source), std::move(common_params_->initiator_csp_info->initiator_self_source),
std::move(navigation_initiator))), std::move(navigation_initiator))),
devtools_navigation_token_(base::UnguessableToken::Create()),
request_navigation_client_(mojo::NullAssociatedRemote()),
commit_navigation_client_(mojo::NullAssociatedRemote()),
navigation_handle_timing_(std::make_unique<NavigationHandleTiming>()),
rfh_restored_from_back_forward_cache_( rfh_restored_from_back_forward_cache_(
rfh_restored_from_back_forward_cache), rfh_restored_from_back_forward_cache),
// Store the old RenderFrameHost id at request creation to be used later. // Store the old RenderFrameHost id at request creation to be used later.
...@@ -1042,7 +1033,6 @@ NavigationRequest::NavigationRequest( ...@@ -1042,7 +1033,6 @@ NavigationRequest::NavigationRequest(
frame_tree_node->current_frame_host()->GetProcess()->GetID(), frame_tree_node->current_frame_host()->GetProcess()->GetID(),
frame_tree_node->current_frame_host()->GetRoutingID())), frame_tree_node->current_frame_host()->GetRoutingID())),
initiator_routing_id_(initiator_routing_id), initiator_routing_id_(initiator_routing_id),
client_security_state_(network::mojom::ClientSecurityState::New()),
coop_status_(frame_tree_node, common_params_->initiator_origin), coop_status_(frame_tree_node, common_params_->initiator_origin),
previous_page_ukm_source_id_( previous_page_ukm_source_id_(
frame_tree_node_->current_frame_host()->GetPageUkmSourceId()) { frame_tree_node_->current_frame_host()->GetPageUkmSourceId()) {
...@@ -1663,7 +1653,7 @@ void NavigationRequest::ResetForCrossDocumentRestart() { ...@@ -1663,7 +1653,7 @@ void NavigationRequest::ResetForCrossDocumentRestart() {
ConvertToCrossDocumentType(common_params_->navigation_type); ConvertToCrossDocumentType(common_params_->navigation_type);
// Reset navigation handle timings. // Reset navigation handle timings.
navigation_handle_timing_ = std::make_unique<NavigationHandleTiming>(); navigation_handle_timing_ = NavigationHandleTiming();
} }
void NavigationRequest::ResetStateForSiteInstanceChange() { void NavigationRequest::ResetStateForSiteInstanceChange() {
...@@ -3480,41 +3470,40 @@ void NavigationRequest::UpdateNavigationHandleTimingsOnResponseReceived( ...@@ -3480,41 +3470,40 @@ void NavigationRequest::UpdateNavigationHandleTimingsOnResponseReceived(
base::TimeTicks loader_callback_time = base::TimeTicks::Now(); base::TimeTicks loader_callback_time = base::TimeTicks::Now();
if (is_first_response) { if (is_first_response) {
DCHECK(navigation_handle_timing_->first_request_start_time.is_null()); DCHECK(navigation_handle_timing_.first_request_start_time.is_null());
DCHECK(navigation_handle_timing_->first_response_start_time.is_null()); DCHECK(navigation_handle_timing_.first_response_start_time.is_null());
DCHECK(navigation_handle_timing_->first_loader_callback_time.is_null()); DCHECK(navigation_handle_timing_.first_loader_callback_time.is_null());
navigation_handle_timing_->first_request_start_time = navigation_handle_timing_.first_request_start_time =
response_head_->load_timing.send_start; response_head_->load_timing.send_start;
navigation_handle_timing_->first_response_start_time = navigation_handle_timing_.first_response_start_time =
response_head_->load_timing.receive_headers_start; response_head_->load_timing.receive_headers_start;
navigation_handle_timing_->first_loader_callback_time = navigation_handle_timing_.first_loader_callback_time = loader_callback_time;
loader_callback_time;
} }
navigation_handle_timing_->final_request_start_time = navigation_handle_timing_.final_request_start_time =
response_head_->load_timing.send_start; response_head_->load_timing.send_start;
navigation_handle_timing_->final_response_start_time = navigation_handle_timing_.final_response_start_time =
response_head_->load_timing.receive_headers_start; response_head_->load_timing.receive_headers_start;
navigation_handle_timing_->final_loader_callback_time = loader_callback_time; navigation_handle_timing_.final_loader_callback_time = loader_callback_time;
// 103 Early Hints experiment (https://crbug.com/1093693). // 103 Early Hints experiment (https://crbug.com/1093693).
if (is_first_response) { if (is_first_response) {
DCHECK(navigation_handle_timing_->early_hints_for_first_request_time DCHECK(
.is_null()); navigation_handle_timing_.early_hints_for_first_request_time.is_null());
navigation_handle_timing_->early_hints_for_first_request_time = navigation_handle_timing_.early_hints_for_first_request_time =
response_head_->load_timing.first_early_hints_time; response_head_->load_timing.first_early_hints_time;
} }
navigation_handle_timing_->early_hints_for_final_request_time = navigation_handle_timing_.early_hints_for_final_request_time =
response_head_->load_timing.first_early_hints_time; response_head_->load_timing.first_early_hints_time;
// |navigation_commit_sent_time| will be updated by // |navigation_commit_sent_time| will be updated by
// UpdateNavigationHandleTimingsOnCommitSent() later. // UpdateNavigationHandleTimingsOnCommitSent() later.
DCHECK(navigation_handle_timing_->navigation_commit_sent_time.is_null()); DCHECK(navigation_handle_timing_.navigation_commit_sent_time.is_null());
} }
void NavigationRequest::UpdateNavigationHandleTimingsOnCommitSent() { void NavigationRequest::UpdateNavigationHandleTimingsOnCommitSent() {
DCHECK(navigation_handle_timing_->navigation_commit_sent_time.is_null()); DCHECK(navigation_handle_timing_.navigation_commit_sent_time.is_null());
navigation_handle_timing_->navigation_commit_sent_time = navigation_handle_timing_.navigation_commit_sent_time =
base::TimeTicks::Now(); base::TimeTicks::Now();
} }
...@@ -4776,7 +4765,7 @@ base::TimeTicks NavigationRequest::NavigationInputStart() { ...@@ -4776,7 +4765,7 @@ base::TimeTicks NavigationRequest::NavigationInputStart() {
} }
const NavigationHandleTiming& NavigationRequest::GetNavigationHandleTiming() { const NavigationHandleTiming& NavigationRequest::GetNavigationHandleTiming() {
return *navigation_handle_timing_; return navigation_handle_timing_;
} }
bool NavigationRequest::IsPost() { bool NavigationRequest::IsPost() {
......
...@@ -1167,7 +1167,7 @@ class CONTENT_EXPORT NavigationRequest ...@@ -1167,7 +1167,7 @@ class CONTENT_EXPORT NavigationRequest
// URLLoaderFactory to facilitate loading blob URLs. // URLLoaderFactory to facilitate loading blob URLs.
scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory_; scoped_refptr<network::SharedURLLoaderFactory> blob_url_loader_factory_;
NavigationState state_; NavigationState state_ = NOT_STARTED;
bool is_navigation_started_ = false; bool is_navigation_started_ = false;
std::unique_ptr<NavigationURLLoader> loader_; std::unique_ptr<NavigationURLLoader> loader_;
...@@ -1186,7 +1186,7 @@ class CONTENT_EXPORT NavigationRequest ...@@ -1186,7 +1186,7 @@ class CONTENT_EXPORT NavigationRequest
const RestoreType restore_type_; const RestoreType restore_type_;
const ReloadType reload_type_; const ReloadType reload_type_;
const int nav_entry_id_; const int nav_entry_id_;
bool is_view_source_; bool is_view_source_ = false;
int bindings_; int bindings_;
bool entry_overrides_ua_ = false; bool entry_overrides_ua_ = false;
...@@ -1197,10 +1197,11 @@ class CONTENT_EXPORT NavigationRequest ...@@ -1197,10 +1197,11 @@ class CONTENT_EXPORT NavigationRequest
// Whether the navigation should be sent to a renderer a process. This is // Whether the navigation should be sent to a renderer a process. This is
// true, except for 204/205 responses and downloads. // true, except for 204/205 responses and downloads.
bool response_should_be_rendered_; bool response_should_be_rendered_ = false;
// The type of SiteInstance associated with this navigation. // The type of SiteInstance associated with this navigation.
AssociatedSiteInstanceType associated_site_instance_type_; AssociatedSiteInstanceType associated_site_instance_type_ =
AssociatedSiteInstanceType::NONE;
// Stores the SiteInstance created on redirects to check if there is an // Stores the SiteInstance created on redirects to check if there is an
// existing RenderProcessHost that can commit the navigation so that the // existing RenderProcessHost that can commit the navigation so that the
...@@ -1227,7 +1228,7 @@ class CONTENT_EXPORT NavigationRequest ...@@ -1227,7 +1228,7 @@ class CONTENT_EXPORT NavigationRequest
// Holds information for the navigation while the WillFailRequest // Holds information for the navigation while the WillFailRequest
// checks are performed by the NavigationHandle. // checks are performed by the NavigationHandle.
bool has_stale_copy_in_cache_; bool has_stale_copy_in_cache_ = false;
net::Error net_error_ = net::OK; net::Error net_error_ = net::OK;
// Detailed host resolution error information. The error code in // Detailed host resolution error information. The error code in
// |resolve_error_info_.error| should be consistent with (but not necessarily // |resolve_error_info_.error| should be consistent with (but not necessarily
...@@ -1255,7 +1256,8 @@ class CONTENT_EXPORT NavigationRequest ...@@ -1255,7 +1256,8 @@ class CONTENT_EXPORT NavigationRequest
base::Optional<SubresourceLoaderParams> subresource_loader_params_; base::Optional<SubresourceLoaderParams> subresource_loader_params_;
// See comment on accessor. // See comment on accessor.
const base::UnguessableToken devtools_navigation_token_; const base::UnguessableToken devtools_navigation_token_ =
base::UnguessableToken::Create();
base::Optional<std::vector<blink::mojom::TransferrableURLLoaderPtr>> base::Optional<std::vector<blink::mojom::TransferrableURLLoaderPtr>>
subresource_overrides_; subresource_overrides_;
...@@ -1332,7 +1334,7 @@ class CONTENT_EXPORT NavigationRequest ...@@ -1332,7 +1334,7 @@ class CONTENT_EXPORT NavigationRequest
std::unique_ptr<WebBundleHandleTracker> web_bundle_handle_tracker_; std::unique_ptr<WebBundleHandleTracker> web_bundle_handle_tracker_;
// Timing information of loading for the navigation. Used for recording UMAs. // Timing information of loading for the navigation. Used for recording UMAs.
std::unique_ptr<NavigationHandleTiming> navigation_handle_timing_; NavigationHandleTiming navigation_handle_timing_;
// The time this navigation was ready to commit. // The time this navigation was ready to commit.
base::TimeTicks ready_to_commit_time_; base::TimeTicks ready_to_commit_time_;
...@@ -1451,7 +1453,8 @@ class CONTENT_EXPORT NavigationRequest ...@@ -1451,7 +1453,8 @@ class CONTENT_EXPORT NavigationRequest
// Holds a set of values needed to enforce several WebPlatform security APIs // Holds a set of values needed to enforce several WebPlatform security APIs
// at the network request level. // at the network request level.
network::mojom::ClientSecurityStatePtr client_security_state_; network::mojom::ClientSecurityStatePtr client_security_state_ =
network::mojom::ClientSecurityState::New();
// Holds the required CSP for this navigation. This will be moved into // Holds the required CSP for this navigation. This will be moved into
// the RenderFrameHost at DidCommitNavigation time. // the RenderFrameHost at DidCommitNavigation time.
......
...@@ -973,34 +973,17 @@ RenderFrameHostImpl::RenderFrameHostImpl( ...@@ -973,34 +973,17 @@ RenderFrameHostImpl::RenderFrameHostImpl(
frame_tree_node_(frame_tree_node), frame_tree_node_(frame_tree_node),
parent_(frame_tree_node_->parent()), parent_(frame_tree_node_->parent()),
routing_id_(routing_id), routing_id_(routing_id),
is_waiting_for_unload_ack_(false),
render_frame_created_(false),
is_waiting_for_beforeunload_completion_(false),
beforeunload_dialog_request_cancels_unload_(false),
unload_ack_is_for_navigation_(false),
beforeunload_timeout_delay_(RenderViewHostImpl::kUnloadTimeout), beforeunload_timeout_delay_(RenderViewHostImpl::kUnloadTimeout),
was_discarded_(false),
is_loading_(false),
nav_entry_id_(0),
browser_plugin_embedder_ax_tree_id_(ui::AXTreeIDUnknown()),
no_create_browser_accessibility_manager_for_testing_(false),
web_ui_type_(WebUI::kNoWebUI),
has_selection_(false),
is_audible_(false),
should_virtual_keyboard_overlay_content_(false),
last_navigation_previews_state_( last_navigation_previews_state_(
blink::PreviewsTypes::PREVIEWS_UNSPECIFIED), blink::PreviewsTypes::PREVIEWS_UNSPECIFIED),
waiting_for_init_(renderer_initiated_creation), waiting_for_init_(renderer_initiated_creation),
has_focused_editable_element_(false),
push_messaging_manager_( push_messaging_manager_(
nullptr, nullptr,
base::OnTaskRunnerDeleter(base::CreateSequencedTaskRunner( base::OnTaskRunnerDeleter(base::CreateSequencedTaskRunner(
{ServiceWorkerContext::GetCoreThreadId()}))), {ServiceWorkerContext::GetCoreThreadId()}))),
active_sandbox_flags_(network::mojom::WebSandboxFlags::kNone),
frame_token_(frame_token), frame_token_(frame_token),
keep_alive_timeout_(base::TimeDelta::FromSeconds(30)), keep_alive_timeout_(base::TimeDelta::FromSeconds(30)),
subframe_unload_timeout_(RenderViewHostImpl::kUnloadTimeout), subframe_unload_timeout_(RenderViewHostImpl::kUnloadTimeout),
commit_callback_interceptor_(nullptr),
media_device_id_salt_base_( media_device_id_salt_base_(
BrowserContext::CreateRandomMediaDeviceIDSalt()), BrowserContext::CreateRandomMediaDeviceIDSalt()),
lifecycle_state_(lifecycle_state) { lifecycle_state_(lifecycle_state) {
......
...@@ -2659,11 +2659,11 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2659,11 +2659,11 @@ class CONTENT_EXPORT RenderFrameHostImpl
// Boolean indicating whether this RenderFrameHost is being actively used or // Boolean indicating whether this RenderFrameHost is being actively used or
// is waiting for FrameHostMsg_Unload_ACK and thus pending deletion. // is waiting for FrameHostMsg_Unload_ACK and thus pending deletion.
bool is_waiting_for_unload_ack_; bool is_waiting_for_unload_ack_ = false;
// Tracks whether the RenderFrame for this RenderFrameHost has been created in // Tracks whether the RenderFrame for this RenderFrameHost has been created in
// the renderer process. // the renderer process.
bool render_frame_created_; bool render_frame_created_ = false;
// Tracks whether the RenderFrame has ever been created for this // Tracks whether the RenderFrame has ever been created for this
// RenderFrameHost or not. This starts out as false, becomes true after the // RenderFrameHost or not. This starts out as false, becomes true after the
...@@ -2680,18 +2680,18 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2680,18 +2680,18 @@ class CONTENT_EXPORT RenderFrameHostImpl
// cross-site transition or a tab close attempt. // cross-site transition or a tab close attempt.
// TODO(clamy): Remove this boolean and add one more state to the state // TODO(clamy): Remove this boolean and add one more state to the state
// machine. // machine.
bool is_waiting_for_beforeunload_completion_; bool is_waiting_for_beforeunload_completion_ = false;
// Valid only when |is_waiting_for_beforeunload_completion_| is true. This // Valid only when |is_waiting_for_beforeunload_completion_| is true. This
// indicates whether a subsequent request to launch a modal dialog should be // indicates whether a subsequent request to launch a modal dialog should be
// honored or whether it should implicitly cause the unload to be canceled. // honored or whether it should implicitly cause the unload to be canceled.
bool beforeunload_dialog_request_cancels_unload_; bool beforeunload_dialog_request_cancels_unload_ = false;
// Valid only when is_waiting_for_beforeunload_completion_ or // Valid only when is_waiting_for_beforeunload_completion_ or
// IsWaitingForUnloadACK is true. This tells us if the unload request // IsWaitingForUnloadACK is true. This tells us if the unload request
// is for closing the entire tab ( = false), or only this RenderFrameHost in // is for closing the entire tab ( = false), or only this RenderFrameHost in
// the case of a navigation ( = true). // the case of a navigation ( = true).
bool unload_ack_is_for_navigation_; bool unload_ack_is_for_navigation_ = false;
// The timeout monitor that runs from when the beforeunload is started in // The timeout monitor that runs from when the beforeunload is started in
// DispatchBeforeUnload() until either the render process invokes the // DispatchBeforeUnload() until either the render process invokes the
...@@ -2720,11 +2720,11 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2720,11 +2720,11 @@ class CONTENT_EXPORT RenderFrameHostImpl
// Returns whether the tab was previously discarded. // Returns whether the tab was previously discarded.
// This is passed to CommitNavigationParams in NavigationRequest. // This is passed to CommitNavigationParams in NavigationRequest.
bool was_discarded_; bool was_discarded_ = false;
// Indicates whether this RenderFrameHost is in the process of loading a // Indicates whether this RenderFrameHost is in the process of loading a
// document or not. // document or not.
bool is_loading_; bool is_loading_ = false;
// Indicates whether this RenderFrameHost has completed firing // Indicates whether this RenderFrameHost has completed firing
// DOMContentLoaded or not. // DOMContentLoaded or not.
...@@ -2735,7 +2735,7 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2735,7 +2735,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
// such as for a new subframe navigation in a different frame. Tracking this // such as for a new subframe navigation in a different frame. Tracking this
// allows us to send things like title and state updates to the latest // allows us to send things like title and state updates to the latest
// relevant NavigationEntry. // relevant NavigationEntry.
int nav_entry_id_; int nav_entry_id_ = 0;
// Used to clean up this RFH when the unload event is taking too long to // Used to clean up this RFH when the unload event is taking too long to
// execute. May be null in tests. // execute. May be null in tests.
...@@ -2774,7 +2774,7 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2774,7 +2774,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
ui::AXTreeData ax_tree_data_; ui::AXTreeData ax_tree_data_;
// The AX tree ID of the embedder, if this is a browser plugin guest. // The AX tree ID of the embedder, if this is a browser plugin guest.
ui::AXTreeID browser_plugin_embedder_ax_tree_id_; ui::AXTreeID browser_plugin_embedder_ax_tree_id_ = ui::AXTreeIDUnknown();
// Samsung Galaxy Note-specific "smart clip" stylus text getter. // Samsung Galaxy Note-specific "smart clip" stylus text getter.
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
...@@ -2786,7 +2786,7 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2786,7 +2786,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
AccessibilityCallbackForTesting accessibility_testing_callback_; AccessibilityCallbackForTesting accessibility_testing_callback_;
// Flag to not create a BrowserAccessibilityManager, for testing. If one // Flag to not create a BrowserAccessibilityManager, for testing. If one
// already exists it will still be used. // already exists it will still be used.
bool no_create_browser_accessibility_manager_for_testing_; bool no_create_browser_accessibility_manager_for_testing_ = false;
// Context shared for each mojom::PermissionService instance created for this // Context shared for each mojom::PermissionService instance created for this
// RFH. // RFH.
...@@ -2840,21 +2840,21 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2840,21 +2840,21 @@ class CONTENT_EXPORT RenderFrameHostImpl
// document is from WebUI source. Otherwise they will be null and // document is from WebUI source. Otherwise they will be null and
// WebUI::kNoWebUI, respectively. // WebUI::kNoWebUI, respectively.
std::unique_ptr<WebUIImpl> web_ui_; std::unique_ptr<WebUIImpl> web_ui_;
WebUI::TypeID web_ui_type_; WebUI::TypeID web_ui_type_ = WebUI::kNoWebUI;
// If true, then the RenderFrame has selected text. // If true, then the RenderFrame has selected text.
bool has_selection_; bool has_selection_ = false;
// If true, then this RenderFrame has one or more audio streams with audible // If true, then this RenderFrame has one or more audio streams with audible
// signal. If false, all audio streams are currently silent (or there are no // signal. If false, all audio streams are currently silent (or there are no
// audio streams). // audio streams).
bool is_audible_; bool is_audible_ = false;
// If true, then the Virtual keyboard rectangle that occludes the content is // If true, then the Virtual keyboard rectangle that occludes the content is
// sent to the VirtualKeyboard API where it fires overlaygeometrychange JS // sent to the VirtualKeyboard API where it fires overlaygeometrychange JS
// event notifying the web authors that Virtual keyboard has occluded the // event notifying the web authors that Virtual keyboard has occluded the
// content. // content.
bool should_virtual_keyboard_overlay_content_; bool should_virtual_keyboard_overlay_content_ = false;
// Used for tracking the latest size of the RenderFrame. // Used for tracking the latest size of the RenderFrame.
base::Optional<gfx::Size> frame_size_; base::Optional<gfx::Size> frame_size_;
...@@ -2892,7 +2892,7 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2892,7 +2892,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
bool waiting_for_init_; bool waiting_for_init_;
// If true then this frame's document has a focused element which is editable. // If true then this frame's document has a focused element which is editable.
bool has_focused_editable_element_; bool has_focused_editable_element_ = false;
std::unique_ptr<PendingNavigation> pending_navigate_; std::unique_ptr<PendingNavigation> pending_navigate_;
...@@ -2945,7 +2945,8 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -2945,7 +2945,8 @@ class CONTENT_EXPORT RenderFrameHostImpl
// copy of the active sandbox flags which are stored in the FrameTreeNode for // copy of the active sandbox flags which are stored in the FrameTreeNode for
// this RenderFrameHost, but may diverge if this RenderFrameHost is pending // this RenderFrameHost, but may diverge if this RenderFrameHost is pending
// deletion. // deletion.
network::mojom::WebSandboxFlags active_sandbox_flags_; network::mojom::WebSandboxFlags active_sandbox_flags_ =
network::mojom::WebSandboxFlags::kNone;
// Same as |active_sandbox_flags_|, except this is computed: // Same as |active_sandbox_flags_|, except this is computed:
// - outside of the renderer process. // - outside of the renderer process.
...@@ -3117,7 +3118,7 @@ class CONTENT_EXPORT RenderFrameHostImpl ...@@ -3117,7 +3118,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
std::string canonical_encoding_; std::string canonical_encoding_;
// Used to intercept DidCommit* calls in tests. // Used to intercept DidCommit* calls in tests.
CommitCallbackInterceptor* commit_callback_interceptor_; CommitCallbackInterceptor* commit_callback_interceptor_ = nullptr;
// Used to hear about CreateNewPopupWidget calls in tests. // Used to hear about CreateNewPopupWidget calls in tests.
CreateNewPopupWidgetCallbackForTesting create_new_popup_widget_callback_; CreateNewPopupWidgetCallbackForTesting create_new_popup_widget_callback_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment