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

Unified Diff: Source/WebCore/loader/LinkLoader.cpp

Issue 11828063: Merge 138173 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « no previous file | Source/WebKit/chromium/tests/PrerenderingTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/loader/LinkLoader.cpp
===================================================================
--- Source/WebCore/loader/LinkLoader.cpp (revision 139388)
+++ Source/WebCore/loader/LinkLoader.cpp (working copy)
@@ -63,6 +63,10 @@
{
if (m_cachedLinkResource)
m_cachedLinkResource->removeClient(this);
+#if ENABLE(LINK_PRERENDER)
+ if (m_prerenderHandle)
+ m_prerenderHandle->removeClient();
+#endif
}
void LinkLoader::linkLoadTimerFired(Timer<LinkLoader>* timer)
@@ -172,6 +176,7 @@
#if ENABLE(LINK_PRERENDER)
if (m_prerenderHandle) {
m_prerenderHandle->cancel();
+ m_prerenderHandle->removeClient();
m_prerenderHandle.clear();
}
#endif
« no previous file with comments | « no previous file | Source/WebKit/chromium/tests/PrerenderingTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698