diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebCore/platform/graphics/Icon.h | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebCore/platform/graphics/Icon.h')
| -rw-r--r-- | WebCore/platform/graphics/Icon.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/Icon.h b/WebCore/platform/graphics/Icon.h index e9f2dc7..59c732f 100644 --- a/WebCore/platform/graphics/Icon.h +++ b/WebCore/platform/graphics/Icon.h @@ -39,6 +39,8 @@ typedef struct HICON__* HICON; #include <QIcon> #elif PLATFORM(GTK) typedef struct _GdkPixbuf GdkPixbuf; +#elif PLATFORM(EFL) +#include <Evas.h> #elif PLATFORM(CHROMIUM) #include "PlatformIcon.h" #endif @@ -51,8 +53,6 @@ class String; class Icon : public RefCounted<Icon> { public: - // Deprecated. This function will be removed. - // FIXME: Remove it when all implementations are moved to ChromeClient::iconForFiles(). static PassRefPtr<Icon> createIconForFiles(const Vector<String>& filenames); ~Icon(); @@ -76,6 +76,9 @@ private: #elif PLATFORM(GTK) Icon(); GdkPixbuf* m_icon; +#elif PLATFORM(EFL) + Icon(); + Evas_Object* m_icon; #elif PLATFORM(CHROMIUM) Icon(const PlatformIcon&); PlatformIcon m_icon; |