webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

2 files changed, 10 insertions, 15 deletions

diff --git a/Source/WebCore/html/forms/FileIconLoader.cpp b/Source/WebCore/html/forms/FileIconLoader.cpp
index a086d406b..275d6ec44 100644
--- a/Source/WebCore/html/forms/FileIconLoader.cpp
+++ b/Source/WebCore/html/forms/FileIconLoader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2017 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,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. 
  *
@@ -37,13 +37,13 @@ namespace WebCore {
 void FileIconLoader::invalidate()
 {
     ASSERT(m_client);
-    m_client = 0;
+    m_client = nullptr;
 }
 
-void FileIconLoader::notifyFinished(PassRefPtr<Icon> icon)
+void FileIconLoader::iconLoaded(RefPtr<Icon>&& icon)
 {
     if (m_client)
-        m_client->updateRendering(icon);
+        m_client->iconLoaded(WTFMove(icon));
 }
 
 FileIconLoader::FileIconLoader(FileIconLoaderClient& client)
diff --git a/Source/WebCore/html/forms/FileIconLoader.h b/Source/WebCore/html/forms/FileIconLoader.h
index b6a3aa6b2..7da73fc92 100644
--- a/Source/WebCore/html/forms/FileIconLoader.h
+++ b/Source/WebCore/html/forms/FileIconLoader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,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. 
  *
@@ -28,21 +28,18 @@
  *
  */
 
-#ifndef FileIconLoader_h
-#define FileIconLoader_h
+#pragma once
 
 #include <wtf/Forward.h>
-#include <wtf/RefCounted.h>
 
 namespace WebCore {
 
-class FileIconLoader;
 class Icon;
 
 class FileIconLoaderClient {
 public:
     virtual ~FileIconLoaderClient() { }
-    virtual void updateRendering(PassRefPtr<Icon>) = 0;
+    virtual void iconLoaded(RefPtr<Icon>&&) = 0;
 };
 
 class FileIconLoader {
@@ -50,12 +47,10 @@ public:
     explicit FileIconLoader(FileIconLoaderClient&);
 
     void invalidate();
-    void notifyFinished(PassRefPtr<Icon>);
+    WEBCORE_EXPORT void iconLoaded(RefPtr<Icon>&&);
 
 private:
     FileIconLoaderClient* m_client;
 };
 
 } // namespace WebCore
-
-#endif