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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 1958823002: Fix implicit access to raw pointer of scoped_refptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Splitting out change to scoped_refptr to follow up patch. Created 4 years, 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 4333 matching lines...) Expand 10 before | Expand all | Expand 10 after
4344 4344
4345 bool RenderFrameImpl::IsMainFrame() { 4345 bool RenderFrameImpl::IsMainFrame() {
4346 return is_main_frame_; 4346 return is_main_frame_;
4347 } 4347 }
4348 4348
4349 bool RenderFrameImpl::IsHidden() { 4349 bool RenderFrameImpl::IsHidden() {
4350 return GetRenderWidget()->is_hidden(); 4350 return GetRenderWidget()->is_hidden();
4351 } 4351 }
4352 4352
4353 bool RenderFrameImpl::IsLocalRoot() const { 4353 bool RenderFrameImpl::IsLocalRoot() const {
4354 bool is_local_root = render_widget_ != nullptr; 4354 bool is_local_root = static_cast<bool>(render_widget_);
4355 DCHECK_EQ(is_local_root, 4355 DCHECK_EQ(is_local_root,
4356 !(frame_->parent() && frame_->parent()->isWebLocalFrame())); 4356 !(frame_->parent() && frame_->parent()->isWebLocalFrame()));
4357 return render_widget_ != nullptr; 4357 return is_local_root;
4358 } 4358 }
4359 4359
4360 // Tell the embedding application that the URL of the active page has changed. 4360 // Tell the embedding application that the URL of the active page has changed.
4361 void RenderFrameImpl::SendDidCommitProvisionalLoad( 4361 void RenderFrameImpl::SendDidCommitProvisionalLoad(
4362 blink::WebFrame* frame, 4362 blink::WebFrame* frame,
4363 blink::WebHistoryCommitType commit_type, 4363 blink::WebHistoryCommitType commit_type,
4364 const blink::WebHistoryItem& item) { 4364 const blink::WebHistoryItem& item) {
4365 DCHECK_EQ(frame_, frame); 4365 DCHECK_EQ(frame_, frame);
4366 WebDataSource* ds = frame->dataSource(); 4366 WebDataSource* ds = frame->dataSource();
4367 DCHECK(ds); 4367 DCHECK(ds);
(...skipping 1659 matching lines...) Expand 10 before | Expand all | Expand 10 after
6027 int match_count, 6027 int match_count,
6028 int ordinal, 6028 int ordinal,
6029 const WebRect& selection_rect, 6029 const WebRect& selection_rect,
6030 bool final_status_update) { 6030 bool final_status_update) {
6031 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count, 6031 Send(new FrameHostMsg_Find_Reply(routing_id_, request_id, match_count,
6032 selection_rect, ordinal, 6032 selection_rect, ordinal,
6033 final_status_update)); 6033 final_status_update));
6034 } 6034 }
6035 6035
6036 } // namespace content 6036 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc/peer_connection_dependency_factory.cc ('k') | device/bluetooth/bluetooth_adapter_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698