webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 5 insertions, 16 deletions

diff --git a/Source/WebCore/loader/icon/IconController.h b/Source/WebCore/loader/icon/IconController.h
index 83844b9d4..31b1562a1 100644
--- a/Source/WebCore/loader/icon/IconController.h
+++ b/Source/WebCore/loader/icon/IconController.h
@@ -12,7 +12,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,28 +28,23 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef IconController_h
-#define IconController_h
+#pragma once
 
 #include "IconDatabaseBase.h"
-#include "IconURL.h"
-#include "URL.h"
 
 namespace WebCore {
 
 class Frame;
 class IconLoader;
+class URL;
 
 class IconController {
-    WTF_MAKE_NONCOPYABLE(IconController);
     WTF_MAKE_FAST_ALLOCATED;
 public:
     explicit IconController(Frame&);
     ~IconController();
 
-    URL url();
-    IconURLs urlsForTypes(int iconTypesMask);
-    IconURL iconURL(IconType) const;
+    WEBCORE_EXPORT URL url();
 
     void startLoader();
     void stopLoader();
@@ -60,15 +55,9 @@ public:
     void commitToDatabase(const URL& icon);
 
 private:
-    bool appendToIconURLs(IconType, IconURLs*);
-    IconURL defaultURL(IconType);
-
     Frame& m_frame;
-
     std::unique_ptr<IconLoader> m_iconLoader;
-    bool m_waitingForLoadDecision;
+    bool m_waitingForLoadDecision { false };
 };
 
 } // namespace WebCore
-
-#endif