webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 8 insertions, 8 deletions

diff --git a/Source/WebCore/loader/icon/PageURLRecord.cpp b/Source/WebCore/loader/icon/PageURLRecord.cpp
index 09d649f83..99dded8f2 100644
--- a/Source/WebCore/loader/icon/PageURLRecord.cpp
+++ b/Source/WebCore/loader/icon/PageURLRecord.cpp
@@ -10,7 +10,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution. 
- * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission. 
  *
@@ -35,29 +35,29 @@ namespace WebCore {
 
 PageURLRecord::PageURLRecord(const String& pageURL)
     : m_pageURL(pageURL)
-    , m_retainCount(0)
 {
 }
 
 PageURLRecord::~PageURLRecord()
 {
-    setIconRecord(0);
+    if (m_iconRecord)
+        m_iconRecord->m_retainingPageURLs.remove(m_pageURL);
 }
 
-void PageURLRecord::setIconRecord(PassRefPtr<IconRecord> icon)
+void PageURLRecord::setIconRecord(RefPtr<IconRecord>&& icon)
 {
     if (m_iconRecord)
         m_iconRecord->m_retainingPageURLs.remove(m_pageURL);
-        
-    m_iconRecord = icon;
-    
+
+    m_iconRecord = WTFMove(icon);
+
     if (m_iconRecord)
         m_iconRecord->m_retainingPageURLs.add(m_pageURL);
 }
     
 PageURLSnapshot PageURLRecord::snapshot(bool forDeletion) const 
 {
-    return PageURLSnapshot(m_pageURL, (m_iconRecord && !forDeletion) ? m_iconRecord->iconURL() : String());
+    return { m_pageURL, (m_iconRecord && !forDeletion) ? m_iconRecord->iconURL() : String() };
 }
 
 } // namespace WebCore