webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 7 insertions, 9 deletions

diff --git a/Source/WebCore/loader/icon/PageURLRecord.h b/Source/WebCore/loader/icon/PageURLRecord.h
index 2b33808d3..189875e32 100644
--- a/Source/WebCore/loader/icon/PageURLRecord.h
+++ b/Source/WebCore/loader/icon/PageURLRecord.h
@@ -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. 
  *
@@ -26,8 +26,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-#ifndef PageURLRecord_h
-#define PageURLRecord_h
+#pragma once
 
 #include <wtf/Noncopyable.h>
 #include <wtf/RefPtr.h>
@@ -62,7 +61,7 @@ public:
 
     inline String url() const { return m_pageURL; }
     
-    void setIconRecord(PassRefPtr<IconRecord>);
+    void setIconRecord(RefPtr<IconRecord>&&);
     IconRecord* iconRecord() { return m_iconRecord.get(); }
 
     PageURLSnapshot snapshot(bool forDeletion = false) const;
@@ -83,13 +82,12 @@ public:
         return m_retainCount > 0;
     }
 
-    inline int retainCount() const { return m_retainCount; }
+    int retainCount() const { return m_retainCount; }
+
 private:
     String m_pageURL;
     RefPtr<IconRecord> m_iconRecord;
-    int m_retainCount;
+    int m_retainCount { 0 };
 };
 
-}
-
-#endif // PageURLRecord_h
+} // namespace WebCore