diff -r 000000000000 -r 4f2f89ce4247 WebKit/win/WebIconFetcher.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/WebKit/win/WebIconFetcher.cpp	Fri Sep 17 09:02:29 2010 +0300
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2008 Apple Inc. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#include "config.h"
+#include "WebKitDLL.h"
+#include "WebIconFetcher.h"
+
+#include "MemoryStream.h"
+#include <WebCore/COMPtr.h>
+#include <WebCore/SharedBuffer.h>
+#include <wtf/PassRefPtr.h>
+
+using namespace WebCore;
+
+class WebIconFetcherClient : public IconFetcherClient {
+public:
+    WebIconFetcherClient(IWebIconFetcherDelegate* delegate)
+        : m_fetcher(0)
+        , m_delegate(delegate)
+    {
+    }
+
+    virtual void finishedFetchingIcon(PassRefPtr<SharedBuffer> iconData)
+    {
+        COMPtr<MemoryStream> memoryStream;
+        if (iconData)
+            memoryStream = MemoryStream::createInstance(iconData);
+
+        m_delegate->finishedLoadingIcon(m_fetcher, memoryStream.get());
+
+        delete this;
+    }
+
+   void setFetcher(WebIconFetcher *fetcher) { m_fetcher = fetcher; }
+    
+private:
+    WebIconFetcher* m_fetcher;
+    COMPtr<IWebIconFetcherDelegate> m_delegate;
+};
+
+// WebIconFetcher -------------------------------------------------------------------
+
+WebIconFetcher* WebIconFetcher::fetchApplicationIcon(Frame* frame, IWebIconFetcherDelegate* delegate)
+{
+    WebIconFetcherClient* client = new WebIconFetcherClient(delegate);
+    
+    RefPtr<IconFetcher> fetcher = IconFetcher::create(frame, client);
+    
+    if (!fetcher)
+        return 0;
+    
+    COMPtr<WebIconFetcher> iconFetcher = new WebIconFetcher(fetcher.release());
+    client->setFetcher(iconFetcher.get());
+
+    return iconFetcher.releaseRef();
+}
+
+WebIconFetcher::WebIconFetcher(PassRefPtr<IconFetcher> iconFetcher)
+    : m_refCount(0)
+    , m_iconFetcher(iconFetcher)
+{
+    gClassCount++;
+}
+
+WebIconFetcher::~WebIconFetcher()
+{
+    gClassCount--;
+}
+
+// IUnknown -------------------------------------------------------------------
+
+HRESULT STDMETHODCALLTYPE WebIconFetcher::QueryInterface(REFIID riid, void** ppvObject)
+{
+    *ppvObject = 0;
+    if (IsEqualGUID(riid, IID_IUnknown))
+        *ppvObject = static_cast<IUnknown*>(this);
+    else if (IsEqualGUID(riid, IID_IWebIconFetcher))
+        *ppvObject = static_cast<IWebIconFetcher*>(this);
+    else
+        return E_NOINTERFACE;
+
+    AddRef();
+    return S_OK;
+}
+
+ULONG STDMETHODCALLTYPE WebIconFetcher::AddRef()
+{
+    return ++m_refCount;
+}
+
+ULONG STDMETHODCALLTYPE WebIconFetcher::Release()
+{
+    ULONG newRef = --m_refCount;
+    if (!newRef)
+        delete this;
+
+    return newRef;
+}
+
+// IUnknown -------------------------------------------------------------------
+
+HRESULT STDMETHODCALLTYPE WebIconFetcher::cancel()
+{
+    m_iconFetcher->cancel();
+
+    return S_OK;
+}