webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 5 insertions, 10 deletions

diff --git a/Source/WebCore/loader/icon/IconRecord.h b/Source/WebCore/loader/icon/IconRecord.h
index e5a47f76e..f2105a39a 100644
--- a/Source/WebCore/loader/icon/IconRecord.h
+++ b/Source/WebCore/loader/icon/IconRecord.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,13 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
  
-#ifndef IconRecord_h
-#define IconRecord_h
+#pragma once
 
 #include "PageURLRecord.h"
 #include "SharedBuffer.h"
 #include <wtf/HashSet.h>
-#include <wtf/OwnPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
@@ -75,16 +73,16 @@ private:
 class IconRecord : public RefCounted<IconRecord> {
     friend class PageURLRecord;
 public:
-    static PassRefPtr<IconRecord> create(const String& url)
+    static Ref<IconRecord> create(const String& url)
     {
-        return adoptRef(new IconRecord(url));
+        return adoptRef(*new IconRecord(url));
     }
     ~IconRecord();
     
     time_t getTimestamp() { return m_stamp; }
     void setTimestamp(time_t stamp) { m_stamp = stamp; }
         
-    void setImageData(PassRefPtr<SharedBuffer> data);
+    void setImageData(RefPtr<SharedBuffer>&&);
     Image* image(const IntSize&);    
     
     String iconURL() { return m_iconURL; }
@@ -119,7 +117,4 @@ private:
     // SizeImageMap m_images;
 };
 
-
 } //namespace WebCore
-
-#endif