Merge 138173

Source/WebCore/loader/LinkLoader.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 45 matching lines @@
     : m_client(client)
     , m_linkLoadTimer(this, &LinkLoader::linkLoadTimerFired)
     , m_linkLoadingErrorTimer(this, &LinkLoader::linkLoadingErrorTimerFired)
 {
 }
 
 LinkLoader::~LinkLoader()
 {
     if (m_cachedLinkResource)
         m_cachedLinkResource->removeClient(this);
+#if ENABLE(LINK_PRERENDER)
+    if (m_prerenderHandle)
+        m_prerenderHandle->removeClient();
+#endif
 }
 
 void LinkLoader::linkLoadTimerFired(Timer<LinkLoader>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_linkLoadTimer);
     m_client->linkLoaded();
 }
 
 void LinkLoader::linkLoadingErrorTimerFired(Timer<LinkLoader>* timer)
 {
@@ skipping 89 matching lines @@
     return true;
 }
 
 void LinkLoader::released()
 {
     // Only prerenders need treatment here; other links either use the CachedResource interface, or are notionally
     // atomic (dns prefetch).
 #if ENABLE(LINK_PRERENDER)
     if (m_prerenderHandle) {
         m_prerenderHandle->cancel();
+        m_prerenderHandle->removeClient();
         m_prerenderHandle.clear();
     }
 #endif
 }
 
 }