content/renderer/pepper/pepper_url_loader_host.cc - Issue 324883002: Merge 275861 "Revert 274770 "Ensure that in-process plugins can'..."

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/pepper/pepper_url_loader_host.cc

Issue 324883002: Merge 275861 "Revert 274770 "Ensure that in-process plugins can'..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2041/src/

Patch Set: Created 6 years, 6 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

Index: content/renderer/pepper/pepper_url_loader_host.cc

===================================================================

--- content/renderer/pepper/pepper_url_loader_host.cc (revision 275929)

+++ content/renderer/pepper/pepper_url_loader_host.cc (working copy)

@@ -361,11 +361,8 @@

void PepperURLLoaderHost::Close() {

if (loader_.get())

loader_->cancel();

- else if (main_document_loader_) {

- blink::WebFrame* frame = GetFrame();

- if (frame)

- frame->stopLoading();

- }

+ else if (main_document_loader_)

+ GetFrame()->stopLoading();

}

blink::WebLocalFrame* PepperURLLoaderHost::GetFrame() {

« no previous file with comments | « content/renderer/pepper/pepper_plugin_instance_impl.cc ('k') | no next file » | no next file with comments »