content/renderer/render_frame_impl.cc - Issue 1382593004: Allow out-of-process iframes to update the mouse cursor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/render_frame_impl.cc

Issue 1382593004: Allow out-of-process iframes to update the mouse cursor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Put const in the right place Created 5 years, 2 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 side-by-side diff with in-line comments

Download patch

« content/browser/site_per_process_browsertest.cc ('K') | « content/browser/site_per_process_browsertest.cc ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index 75f62d9632dd49dd09474aee8c90679a7af35885..4ac76cd74282adfe4cf8ea27a7c55a6efb0a1c21 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -833,7 +833,7 @@ void RenderFrameImpl::Initialize() {

}

RenderWidget* RenderFrameImpl::GetRenderWidget() {

- return render_view_.get();

+ return render_widget_.get() ? render_widget_.get() : render_view_.get();

dcheng 2015/10/13 22:14:37 return render_widget_ ? render_widget_.get() : ren

kenrb 2015/10/14 16:29:53 Looks like we don't, I think I accidentally pulled

}

#if defined(ENABLE_PLUGINS)