Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 89 insertions, 0 deletions

diff --git a/Source/WebCore/platform/graphics/Icon.h b/Source/WebCore/platform/graphics/Icon.h
new file mode 100644
index 0000000..c83685f
--- /dev/null
+++ b/Source/WebCore/platform/graphics/Icon.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef Icon_h
+#define Icon_h
+
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+#include <wtf/Forward.h>
+#include <wtf/Vector.h>
+
+#if PLATFORM(MAC)
+#include <wtf/RetainPtr.h>
+#ifdef __OBJC__
+@class NSImage;
+#else
+class NSImage;
+#endif
+#elif PLATFORM(WIN)
+typedef struct HICON__* HICON;
+#elif PLATFORM(QT)
+#include <QIcon>
+#elif PLATFORM(GTK)
+typedef struct _GdkPixbuf GdkPixbuf;
+#elif PLATFORM(EFL)
+typedef struct _Evas_Object Evas_Object;
+#elif PLATFORM(CHROMIUM)
+#include "PlatformIcon.h"
+#endif
+
+namespace WebCore {
+
+class GraphicsContext;
+class IntRect;
+    
+class Icon : public RefCounted<Icon> {
+public:
+    static PassRefPtr<Icon> createIconForFiles(const Vector<String>& filenames);
+
+    ~Icon();
+
+    void paint(GraphicsContext*, const IntRect&);
+
+#if PLATFORM(WIN)
+    static PassRefPtr<Icon> create(HICON hIcon) { return adoptRef(new Icon(hIcon)); }
+#endif
+
+private:
+#if PLATFORM(MAC)
+    Icon(NSImage*);
+    RetainPtr<NSImage> m_nsImage;
+#elif PLATFORM(WIN)
+    Icon(HICON);
+    HICON m_hIcon;
+#elif PLATFORM(QT)
+    Icon();
+    QIcon m_icon;
+#elif PLATFORM(GTK)
+    Icon();
+    GdkPixbuf* m_icon;
+#elif PLATFORM(EFL)
+    Icon();
+    Evas_Object* m_icon;
+#elif PLATFORM(CHROMIUM)
+    Icon(const PlatformIcon&);
+    PlatformIcon m_icon;
+#endif
+};
+
+}
+
+#endif