Source/WebKit/chromium/src/AssociatedURLLoader.cpp - Issue 7530003: Merge 91789 - Cancel the load when an associated URL loader goes out of scope.

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: Source/WebKit/chromium/src/AssociatedURLLoader.cpp

Issue 7530003: Merge 91789 - Cancel the load when an associated URL loader goes out of scope. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/

Patch Set: Created 9 years, 5 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: Source/WebKit/chromium/src/AssociatedURLLoader.cpp

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

--- Source/WebKit/chromium/src/AssociatedURLLoader.cpp (revision 91943)

+++ Source/WebKit/chromium/src/AssociatedURLLoader.cpp (working copy)

@@ -215,8 +215,7 @@

AssociatedURLLoader::~AssociatedURLLoader()

{

- if (m_clientAdapter)

- m_clientAdapter->clearClient();

+ cancel();

}

#define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \

@@ -255,10 +254,10 @@

void AssociatedURLLoader::cancel()

{

- if (m_loader) {

+ if (m_clientAdapter)

m_clientAdapter->clearClient();

+ if (m_loader)

m_loader->cancel();

- }

}

void AssociatedURLLoader::setDefersLoading(bool defersLoading)

« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | no next file » | no next file with comments »