Merge WebKit at r82507: Initial merge by git

Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e

114 files changed, 1781 insertions, 1762 deletions

diff --git a/Source/WebKit/win/AccessibleBase.h b/Source/WebKit/win/AccessibleBase.h
index df2d927..008d580 100644
--- a/Source/WebKit/win/AccessibleBase.h
+++ b/Source/WebKit/win/AccessibleBase.h
@@ -26,10 +26,9 @@
 #ifndef AccessibleBase_h
 #define AccessibleBase_h
 
+#include "WebKit.h"
 #include <WebCore/AccessibilityObject.h>
 #include <WebCore/AccessibilityObjectWrapperWin.h>
-#include <WebKit/WebKit.h>
-#include <oleacc.h>
 
 class DECLSPEC_UUID("3dbd565b-db22-4d88-8e0e-778bde54524a") AccessibleBase : public IAccessibleComparable, public IServiceProvider, public WebCore::AccessibilityObjectWrapper {
 public:
diff --git a/Source/WebKit/win/AccessibleDocument.h b/Source/WebKit/win/AccessibleDocument.h
index aa38be8..bc13613 100644
--- a/Source/WebKit/win/AccessibleDocument.h
+++ b/Source/WebKit/win/AccessibleDocument.h
@@ -27,14 +27,11 @@
 #define AccessibleDocument_h
 
 #include "AccessibleBase.h"
-#include "WebKit.h"
-
-using WebCore::Document;
 
 class AccessibleDocument : public AccessibleBase {
 public:
-    AccessibleDocument(Document*);
-    Document* document() const;
+    AccessibleDocument(WebCore::Document*);
+    WebCore::Document* document() const;
 
 protected:
     virtual long role() const;
diff --git a/Source/WebKit/win/CFDictionaryPropertyBag.h b/Source/WebKit/win/CFDictionaryPropertyBag.h
index 3cac464..17964e5 100644
--- a/Source/WebKit/win/CFDictionaryPropertyBag.h
+++ b/Source/WebKit/win/CFDictionaryPropertyBag.h
@@ -26,6 +26,7 @@
 #ifndef CFDictionaryPropertyBag_h
 #define CFDictionaryPropertyBag_h
 
+#include "WebKit.h"
 #include <WebCore/COMPtr.h>
 #include <wtf/RetainPtr.h>
 
diff --git a/Source/WebKit/win/COMPropertyBag.h b/Source/WebKit/win/COMPropertyBag.h
index 620458e..dd0a8c4 100644
--- a/Source/WebKit/win/COMPropertyBag.h
+++ b/Source/WebKit/win/COMPropertyBag.h
@@ -1,234 +1,235 @@
-/*

- * 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. 

- */

-

-#ifndef COMPropertyBag_h

-#define COMPropertyBag_h

-

-#define NOMINMAX

-#include <unknwn.h>

-

-#include <wtf/Noncopyable.h>

-#include <wtf/HashMap.h>

-

-#include "COMVariantSetter.h"

-

-template<typename ValueType, typename KeyType = typename WTF::String, typename HashType = typename WTF::StringHash>

-class COMPropertyBag : public IPropertyBag, public IPropertyBag2 {

-    WTF_MAKE_NONCOPYABLE(COMPropertyBag);

-public:

-    typedef HashMap<KeyType, ValueType, HashType> HashMapType;

-

-    static COMPropertyBag* createInstance(const HashMapType&);

-    static COMPropertyBag* adopt(HashMapType&);

-

-    // IUnknown

-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);

-    virtual ULONG STDMETHODCALLTYPE AddRef();

-    virtual ULONG STDMETHODCALLTYPE Release();

-

-    // IPropertyBag

-    virtual HRESULT STDMETHODCALLTYPE Read(LPCOLESTR pszPropName, VARIANT*, IErrorLog*);

-    virtual HRESULT STDMETHODCALLTYPE Write(LPCOLESTR pszPropName, VARIANT*);

-

-    // IPropertyBag2

-    virtual HRESULT STDMETHODCALLTYPE Read(ULONG cProperties, PROPBAG2*, IErrorLog*, VARIANT* pvarValue, HRESULT* phrError);

-    virtual HRESULT STDMETHODCALLTYPE Write(ULONG cProperties, PROPBAG2*, VARIANT*);

-    virtual HRESULT STDMETHODCALLTYPE CountProperties(ULONG* pcProperties);

-    virtual HRESULT STDMETHODCALLTYPE GetPropertyInfo(ULONG iProperty, ULONG cProperties, PROPBAG2* pPropBag, ULONG* pcProperties);

-    virtual HRESULT STDMETHODCALLTYPE LoadObject(LPCOLESTR pstrName, DWORD dwHint, IUnknown*, IErrorLog*);

-

-private:

-    COMPropertyBag()

-        : m_refCount(0)

-    {

-    }

-

-    COMPropertyBag(const HashMapType& hashMap)

-        : m_refCount(0)

-        , m_hashMap(hashMap)

-    {

-    }

-

-    ~COMPropertyBag() {}

-

-    ULONG m_refCount;

-    HashMapType m_hashMap;

-};

-

-// COMPropertyBag ------------------------------------------------------------------

-template<typename ValueType, typename KeyType, typename HashType>

-COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<typename ValueType, typename KeyType, HashType>::createInstance(const HashMapType& hashMap)

-{

-    COMPropertyBag* instance = new COMPropertyBag(hashMap);

-    instance->AddRef();

-    return instance;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<typename ValueType, typename KeyType, HashType>::adopt(HashMapType& hashMap)

-{

-    COMPropertyBag* instance = new COMPropertyBag;

-    instance->m_hashMap.swap(hashMap);

-    instance->AddRef();

-    return instance;

-}

-

-// IUnknown ------------------------------------------------------------------------

-template<typename ValueType, typename KeyType, typename HashType>

-HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::QueryInterface(REFIID riid, void** ppvObject)

-{

-    *ppvObject = 0;

-    if (IsEqualGUID(riid, IID_IUnknown))

-        *ppvObject = static_cast<IPropertyBag*>(this);

-    else if (IsEqualGUID(riid, IID_IPropertyBag))

-        *ppvObject = static_cast<IPropertyBag*>(this);

-    else if (IsEqualGUID(riid, IID_IPropertyBag2))

-        *ppvObject = static_cast<IPropertyBag2*>(this);

-    else

-        return E_NOINTERFACE;

-

-    AddRef();

-    return S_OK;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-ULONG STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::AddRef()

-{

-    return ++m_refCount;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-ULONG STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Release()

-{

-    ULONG newRef = --m_refCount;

-    if (!newRef)

-        delete this;

-

-    return newRef;

-}

-

-// IPropertyBag --------------------------------------------------------------------

-

-template<typename ValueType, typename KeyType, typename HashType>

-HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Read(LPCOLESTR pszPropName, VARIANT* pVar, IErrorLog* pErrorLog)

-{

-    if (!pszPropName)

-        return E_POINTER;

-

-    HashMapType::const_iterator it = m_hashMap.find(String(pszPropName));

-    HashMapType::const_iterator end = m_hashMap.end();

-    if (it == end)

-        return E_INVALIDARG;

-

-    VARTYPE requestedType = V_VT(pVar);

-    V_VT(pVar) = VT_EMPTY;

-    COMVariantSetter<ValueType>::setVariant(pVar, it->second);

-

-    if (requestedType != COMVariantSetter<ValueType>::variantType(it->second) && requestedType != VT_EMPTY)

-        return ::VariantChangeType(pVar, pVar, VARIANT_NOUSEROVERRIDE | VARIANT_ALPHABOOL, requestedType);

-

-    return S_OK;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Write(LPCOLESTR pszPropName, VARIANT* pVar)

-{

-    return E_FAIL;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Read(ULONG cProperties, PROPBAG2* pPropBag, IErrorLog* pErrorLog, VARIANT* pvarValue, HRESULT* phrError)

-{

-    if (!pPropBag || !pvarValue || !phrError)

-        return E_POINTER;

-

-    HRESULT hr = S_OK;

-

-    for (ULONG i = 0; i < cProperties; ++i) {

-        VariantInit(&pvarValue[i]);

-        pvarValue[i].vt = pPropBag[i].vt;

-        phrError[i] = Read(pPropBag[i].pstrName, &pvarValue[i], pErrorLog);

-        if (FAILED(phrError[i]))

-            hr = E_FAIL;

-    }

-

-    return hr;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Write(ULONG cProperties, PROPBAG2*, VARIANT*)

-{

-    return E_NOTIMPL;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::CountProperties(ULONG* pcProperties)

-{

-    if (!pcProperties)

-        return E_POINTER;

-

-    *pcProperties = m_hashMap.size();

-    return S_OK;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::GetPropertyInfo(ULONG iProperty, ULONG cProperties, PROPBAG2* pPropBag, ULONG* pcProperties)

-{

-    if (!pPropBag || !pcProperties)

-        return E_POINTER;

-

-    if (m_hashMap.size() <= iProperty)

-        return E_INVALIDARG;

-

-    *pcProperties = 0;

-    typedef HashMapType::const_iterator Iterator;

-    Iterator current = m_hashMap.begin();

-    Iterator end = m_hashMap.end();

-    for (ULONG i = 0; i < iProperty; ++i, ++current)

-        ;

-    for (ULONG j = 0; j < cProperties && current != end; ++j, ++current) {

-        // FIXME: the following fields aren't filled in

-        //pPropBag[j].cfType;   // (CLIPFORMAT) Clipboard format or MIME type of the property.

-        //pPropBag[j].clsid;    // (CLSID) CLSID of the object. This member is valid only if dwType is PROPBAG2_TYPE_OBJECT.

-

-        pPropBag[j].dwType = PROPBAG2_TYPE_DATA;

-        pPropBag[j].vt = COMVariantSetter<ValueType>::variantType(current->second);

-        pPropBag[j].dwHint = iProperty + j;

-        pPropBag[j].pstrName = (LPOLESTR)CoTaskMemAlloc(sizeof(wchar_t)*(current->first.length()+1));

-        if (!pPropBag[j].pstrName)

-            return E_OUTOFMEMORY;

-        wcscpy_s(pPropBag[j].pstrName, current->first.length()+1, static_cast<String>(current->first).charactersWithNullTermination());

-        ++*pcProperties;

-    }

-    return S_OK;

-}

-

-template<typename ValueType, typename KeyType, typename HashType>

-HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::LoadObject(LPCOLESTR pstrName, DWORD dwHint, IUnknown*, IErrorLog*)

-{

-    return E_NOTIMPL;

-}

-

-#endif // COMPropertyBag_h

+/*
+ * 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. 
+ */
+
+#ifndef COMPropertyBag_h
+#define COMPropertyBag_h
+
+#define NOMINMAX
+#include <ocidl.h>
+#include <unknwn.h>
+
+#include <wtf/Noncopyable.h>
+#include <wtf/HashMap.h>
+
+#include "COMVariantSetter.h"
+
+template<typename ValueType, typename KeyType = typename WTF::String, typename HashType = typename WTF::StringHash>
+class COMPropertyBag : public IPropertyBag, public IPropertyBag2 {
+    WTF_MAKE_NONCOPYABLE(COMPropertyBag);
+public:
+    typedef HashMap<KeyType, ValueType, HashType> HashMapType;
+
+    static COMPropertyBag* createInstance(const HashMapType&);
+    static COMPropertyBag* adopt(HashMapType&);
+
+    // IUnknown
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
+    virtual ULONG STDMETHODCALLTYPE AddRef();
+    virtual ULONG STDMETHODCALLTYPE Release();
+
+    // IPropertyBag
+    virtual HRESULT STDMETHODCALLTYPE Read(LPCOLESTR pszPropName, VARIANT*, IErrorLog*);
+    virtual HRESULT STDMETHODCALLTYPE Write(LPCOLESTR pszPropName, VARIANT*);
+
+    // IPropertyBag2
+    virtual HRESULT STDMETHODCALLTYPE Read(ULONG cProperties, PROPBAG2*, IErrorLog*, VARIANT* pvarValue, HRESULT* phrError);
+    virtual HRESULT STDMETHODCALLTYPE Write(ULONG cProperties, PROPBAG2*, VARIANT*);
+    virtual HRESULT STDMETHODCALLTYPE CountProperties(ULONG* pcProperties);
+    virtual HRESULT STDMETHODCALLTYPE GetPropertyInfo(ULONG iProperty, ULONG cProperties, PROPBAG2* pPropBag, ULONG* pcProperties);
+    virtual HRESULT STDMETHODCALLTYPE LoadObject(LPCOLESTR pstrName, DWORD dwHint, IUnknown*, IErrorLog*);
+
+private:
+    COMPropertyBag()
+        : m_refCount(0)
+    {
+    }
+
+    COMPropertyBag(const HashMapType& hashMap)
+        : m_refCount(0)
+        , m_hashMap(hashMap)
+    {
+    }
+
+    ~COMPropertyBag() {}
+
+    ULONG m_refCount;
+    HashMapType m_hashMap;
+};
+
+// COMPropertyBag ------------------------------------------------------------------
+template<typename ValueType, typename KeyType, typename HashType>
+COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<typename ValueType, typename KeyType, HashType>::createInstance(const HashMapType& hashMap)
+{
+    COMPropertyBag* instance = new COMPropertyBag(hashMap);
+    instance->AddRef();
+    return instance;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+COMPropertyBag<ValueType, KeyType, HashType>* COMPropertyBag<typename ValueType, typename KeyType, HashType>::adopt(HashMapType& hashMap)
+{
+    COMPropertyBag* instance = new COMPropertyBag;
+    instance->m_hashMap.swap(hashMap);
+    instance->AddRef();
+    return instance;
+}
+
+// IUnknown ------------------------------------------------------------------------
+template<typename ValueType, typename KeyType, typename HashType>
+HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::QueryInterface(REFIID riid, void** ppvObject)
+{
+    *ppvObject = 0;
+    if (IsEqualGUID(riid, IID_IUnknown))
+        *ppvObject = static_cast<IPropertyBag*>(this);
+    else if (IsEqualGUID(riid, IID_IPropertyBag))
+        *ppvObject = static_cast<IPropertyBag*>(this);
+    else if (IsEqualGUID(riid, IID_IPropertyBag2))
+        *ppvObject = static_cast<IPropertyBag2*>(this);
+    else
+        return E_NOINTERFACE;
+
+    AddRef();
+    return S_OK;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+ULONG STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::AddRef()
+{
+    return ++m_refCount;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+ULONG STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Release()
+{
+    ULONG newRef = --m_refCount;
+    if (!newRef)
+        delete this;
+
+    return newRef;
+}
+
+// IPropertyBag --------------------------------------------------------------------
+
+template<typename ValueType, typename KeyType, typename HashType>
+HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Read(LPCOLESTR pszPropName, VARIANT* pVar, IErrorLog* pErrorLog)
+{
+    if (!pszPropName)
+        return E_POINTER;
+
+    HashMapType::const_iterator it = m_hashMap.find(String(pszPropName));
+    HashMapType::const_iterator end = m_hashMap.end();
+    if (it == end)
+        return E_INVALIDARG;
+
+    VARTYPE requestedType = V_VT(pVar);
+    V_VT(pVar) = VT_EMPTY;
+    COMVariantSetter<ValueType>::setVariant(pVar, it->second);
+
+    if (requestedType != COMVariantSetter<ValueType>::variantType(it->second) && requestedType != VT_EMPTY)
+        return ::VariantChangeType(pVar, pVar, VARIANT_NOUSEROVERRIDE | VARIANT_ALPHABOOL, requestedType);
+
+    return S_OK;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Write(LPCOLESTR pszPropName, VARIANT* pVar)
+{
+    return E_FAIL;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Read(ULONG cProperties, PROPBAG2* pPropBag, IErrorLog* pErrorLog, VARIANT* pvarValue, HRESULT* phrError)
+{
+    if (!pPropBag || !pvarValue || !phrError)
+        return E_POINTER;
+
+    HRESULT hr = S_OK;
+
+    for (ULONG i = 0; i < cProperties; ++i) {
+        VariantInit(&pvarValue[i]);
+        pvarValue[i].vt = pPropBag[i].vt;
+        phrError[i] = Read(pPropBag[i].pstrName, &pvarValue[i], pErrorLog);
+        if (FAILED(phrError[i]))
+            hr = E_FAIL;
+    }
+
+    return hr;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::Write(ULONG cProperties, PROPBAG2*, VARIANT*)
+{
+    return E_NOTIMPL;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::CountProperties(ULONG* pcProperties)
+{
+    if (!pcProperties)
+        return E_POINTER;
+
+    *pcProperties = m_hashMap.size();
+    return S_OK;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::GetPropertyInfo(ULONG iProperty, ULONG cProperties, PROPBAG2* pPropBag, ULONG* pcProperties)
+{
+    if (!pPropBag || !pcProperties)
+        return E_POINTER;
+
+    if (m_hashMap.size() <= iProperty)
+        return E_INVALIDARG;
+
+    *pcProperties = 0;
+    typedef HashMapType::const_iterator Iterator;
+    Iterator current = m_hashMap.begin();
+    Iterator end = m_hashMap.end();
+    for (ULONG i = 0; i < iProperty; ++i, ++current)
+        ;
+    for (ULONG j = 0; j < cProperties && current != end; ++j, ++current) {
+        // FIXME: the following fields aren't filled in
+        //pPropBag[j].cfType;   // (CLIPFORMAT) Clipboard format or MIME type of the property.
+        //pPropBag[j].clsid;    // (CLSID) CLSID of the object. This member is valid only if dwType is PROPBAG2_TYPE_OBJECT.
+
+        pPropBag[j].dwType = PROPBAG2_TYPE_DATA;
+        pPropBag[j].vt = COMVariantSetter<ValueType>::variantType(current->second);
+        pPropBag[j].dwHint = iProperty + j;
+        pPropBag[j].pstrName = (LPOLESTR)CoTaskMemAlloc(sizeof(wchar_t)*(current->first.length()+1));
+        if (!pPropBag[j].pstrName)
+            return E_OUTOFMEMORY;
+        wcscpy_s(pPropBag[j].pstrName, current->first.length()+1, static_cast<String>(current->first).charactersWithNullTermination());
+        ++*pcProperties;
+    }
+    return S_OK;
+}
+
+template<typename ValueType, typename KeyType, typename HashType>
+HRESULT STDMETHODCALLTYPE COMPropertyBag<ValueType, KeyType, HashType>::LoadObject(LPCOLESTR pstrName, DWORD dwHint, IUnknown*, IErrorLog*)
+{
+    return E_NOTIMPL;
+}
+
+#endif // COMPropertyBag_h
diff --git a/Source/WebKit/win/COMVariantSetter.h b/Source/WebKit/win/COMVariantSetter.h
index feb233c..e211dca 100644
--- a/Source/WebKit/win/COMVariantSetter.h
+++ b/Source/WebKit/win/COMVariantSetter.h
@@ -1,194 +1,194 @@
-/*

- * Copyright (C) 2007, 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. 

- */

-

-#ifndef COMVariantSetter_h

-#define COMVariantSetter_h

-

-#include <WebCore/BString.h>

-#include <WebCore/COMPtr.h>

-#include <wtf/Assertions.h>

-#include <wtf/Forward.h>

-

-template<typename T> struct COMVariantSetter {};

-

-template<typename T> struct COMVariantSetterBase

-{

-    static inline VARENUM variantType(const T&)

-    {

-        return COMVariantSetter<T>::VariantType;

-    }

-};

-

-template<> struct COMVariantSetter<WTF::String> : COMVariantSetterBase<WTF::String>

-{

-    static const VARENUM VariantType = VT_BSTR;

-

-    static void setVariant(VARIANT* variant, const WTF::String& value)

-    {

-        ASSERT(V_VT(variant) == VT_EMPTY);

-

-        V_VT(variant) = VariantType;

-        V_BSTR(variant) = WebCore::BString(value).release();

-    }

-};

-

-template<> struct COMVariantSetter<bool> : COMVariantSetterBase<bool>

-{

-    static const VARENUM VariantType = VT_BOOL;

-

-    static void setVariant(VARIANT* variant, bool value)

-    {

-        ASSERT(V_VT(variant) == VT_EMPTY);

-

-        V_VT(variant) = VariantType;

-        V_BOOL(variant) = value;

-    }

-};

-

-template<> struct COMVariantSetter<unsigned long long> : COMVariantSetterBase<unsigned long long>

-{

-    static const VARENUM VariantType = VT_UI8;

-

-    static void setVariant(VARIANT* variant, unsigned long long value)

-    {

-        ASSERT(V_VT(variant) == VT_EMPTY);

-

-        V_VT(variant) = VariantType;

-        V_UI8(variant) = value;

-    }

-};

-

-template<> struct COMVariantSetter<int> : COMVariantSetterBase<int>

-{

-    static const VARENUM VariantType = VT_I4;

-

-    static void setVariant(VARIANT* variant, int value)

-    {

-        ASSERT(V_VT(variant) == VT_EMPTY);

-

-        V_VT(variant) = VariantType;

-        V_I4(variant) = value;

-    }

-};

-

-template<> struct COMVariantSetter<float> : COMVariantSetterBase<float>

-{

-    static const VARENUM VariantType = VT_R4;

-

-    static void setVariant(VARIANT* variant, float value)

-    {

-        ASSERT(V_VT(variant) == VT_EMPTY);

-

-        V_VT(variant) = VariantType;

-        V_R4(variant) = value;

-    }

-};

-

-template<typename T> struct COMVariantSetter<COMPtr<T> > : COMVariantSetterBase<COMPtr<T> >

-{

-    static const VARENUM VariantType = VT_UNKNOWN;

-

-    static void setVariant(VARIANT* variant, const COMPtr<T>& value)

-    {

-        ASSERT(V_VT(variant) == VT_EMPTY);

-

-        V_VT(variant) = VariantType;

-        V_UNKNOWN(variant) = value.get();

-        value->AddRef();

-    }

-};

-

-template<typename COMType, typename UnderlyingType>

-struct COMIUnknownVariantSetter : COMVariantSetterBase<UnderlyingType>

-{

-    static const VARENUM VariantType = VT_UNKNOWN;

-

-    static void setVariant(VARIANT* variant, const UnderlyingType& value)

-    {

-        ASSERT(V_VT(variant) == VT_EMPTY);

-

-        V_VT(variant) = VariantType;

-        V_UNKNOWN(variant) = COMType::createInstance(value);

-    }

-};

-

-class COMVariant {

-public:

-    COMVariant()

-    {

-        ::VariantInit(&m_variant);

-    }

-

-    template<typename UnderlyingType>

-    COMVariant(UnderlyingType value)

-    {

-        ::VariantInit(&m_variant);

-        COMVariantSetter<UnderlyingType>::setVariant(&m_variant, value);

-    }

-

-    ~COMVariant()

-    {

-        ::VariantClear(&m_variant);

-    }

-

-    COMVariant(const COMVariant& other)

-    {

-        ::VariantInit(&m_variant);

-        other.copyTo(&m_variant);

-    }

-

-    COMVariant& operator=(const COMVariant& other)

-    {

-        other.copyTo(&m_variant);

-        return *this;

-    }

-

-    void copyTo(VARIANT* dest) const

-    {

-        ::VariantCopy(dest, const_cast<VARIANT*>(&m_variant));

-    }

-

-    VARENUM variantType() const { return static_cast<VARENUM>(V_VT(&m_variant)); }

-

-private:

-    VARIANT m_variant;

-};

-

-template<> struct COMVariantSetter<COMVariant>

-{

-    static inline VARENUM variantType(const COMVariant& value)

-    {

-        return value.variantType();

-    }

-

-    static void setVariant(VARIANT* variant, const COMVariant& value)

-    {

-        ASSERT(V_VT(variant) == VT_EMPTY);

-

-        value.copyTo(variant);

-    }

-};

-

-#endif // COMVariantSetter

+/*
+ * Copyright (C) 2007, 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. 
+ */
+
+#ifndef COMVariantSetter_h
+#define COMVariantSetter_h
+
+#include <WebCore/BString.h>
+#include <WebCore/COMPtr.h>
+#include <wtf/Assertions.h>
+#include <wtf/Forward.h>
+
+template<typename T> struct COMVariantSetter {};
+
+template<typename T> struct COMVariantSetterBase
+{
+    static inline VARENUM variantType(const T&)
+    {
+        return COMVariantSetter<T>::VariantType;
+    }
+};
+
+template<> struct COMVariantSetter<WTF::String> : COMVariantSetterBase<WTF::String>
+{
+    static const VARENUM VariantType = VT_BSTR;
+
+    static void setVariant(VARIANT* variant, const WTF::String& value)
+    {
+        ASSERT(V_VT(variant) == VT_EMPTY);
+
+        V_VT(variant) = VariantType;
+        V_BSTR(variant) = WebCore::BString(value).release();
+    }
+};
+
+template<> struct COMVariantSetter<bool> : COMVariantSetterBase<bool>
+{
+    static const VARENUM VariantType = VT_BOOL;
+
+    static void setVariant(VARIANT* variant, bool value)
+    {
+        ASSERT(V_VT(variant) == VT_EMPTY);
+
+        V_VT(variant) = VariantType;
+        V_BOOL(variant) = value;
+    }
+};
+
+template<> struct COMVariantSetter<unsigned long long> : COMVariantSetterBase<unsigned long long>
+{
+    static const VARENUM VariantType = VT_UI8;
+
+    static void setVariant(VARIANT* variant, unsigned long long value)
+    {
+        ASSERT(V_VT(variant) == VT_EMPTY);
+
+        V_VT(variant) = VariantType;
+        V_UI8(variant) = value;
+    }
+};
+
+template<> struct COMVariantSetter<int> : COMVariantSetterBase<int>
+{
+    static const VARENUM VariantType = VT_I4;
+
+    static void setVariant(VARIANT* variant, int value)
+    {
+        ASSERT(V_VT(variant) == VT_EMPTY);
+
+        V_VT(variant) = VariantType;
+        V_I4(variant) = value;
+    }
+};
+
+template<> struct COMVariantSetter<float> : COMVariantSetterBase<float>
+{
+    static const VARENUM VariantType = VT_R4;
+
+    static void setVariant(VARIANT* variant, float value)
+    {
+        ASSERT(V_VT(variant) == VT_EMPTY);
+
+        V_VT(variant) = VariantType;
+        V_R4(variant) = value;
+    }
+};
+
+template<typename T> struct COMVariantSetter<COMPtr<T> > : COMVariantSetterBase<COMPtr<T> >
+{
+    static const VARENUM VariantType = VT_UNKNOWN;
+
+    static void setVariant(VARIANT* variant, const COMPtr<T>& value)
+    {
+        ASSERT(V_VT(variant) == VT_EMPTY);
+
+        V_VT(variant) = VariantType;
+        V_UNKNOWN(variant) = value.get();
+        value->AddRef();
+    }
+};
+
+template<typename COMType, typename UnderlyingType>
+struct COMIUnknownVariantSetter : COMVariantSetterBase<UnderlyingType>
+{
+    static const VARENUM VariantType = VT_UNKNOWN;
+
+    static void setVariant(VARIANT* variant, const UnderlyingType& value)
+    {
+        ASSERT(V_VT(variant) == VT_EMPTY);
+
+        V_VT(variant) = VariantType;
+        V_UNKNOWN(variant) = COMType::createInstance(value);
+    }
+};
+
+class COMVariant {
+public:
+    COMVariant()
+    {
+        ::VariantInit(&m_variant);
+    }
+
+    template<typename UnderlyingType>
+    COMVariant(UnderlyingType value)
+    {
+        ::VariantInit(&m_variant);
+        COMVariantSetter<UnderlyingType>::setVariant(&m_variant, value);
+    }
+
+    ~COMVariant()
+    {
+        ::VariantClear(&m_variant);
+    }
+
+    COMVariant(const COMVariant& other)
+    {
+        ::VariantInit(&m_variant);
+        other.copyTo(&m_variant);
+    }
+
+    COMVariant& operator=(const COMVariant& other)
+    {
+        other.copyTo(&m_variant);
+        return *this;
+    }
+
+    void copyTo(VARIANT* dest) const
+    {
+        ::VariantCopy(dest, const_cast<VARIANT*>(&m_variant));
+    }
+
+    VARENUM variantType() const { return static_cast<VARENUM>(V_VT(&m_variant)); }
+
+private:
+    VARIANT m_variant;
+};
+
+template<> struct COMVariantSetter<COMVariant>
+{
+    static inline VARENUM variantType(const COMVariant& value)
+    {
+        return value.variantType();
+    }
+
+    static void setVariant(VARIANT* variant, const COMVariant& value)
+    {
+        ASSERT(V_VT(variant) == VT_EMPTY);
+
+        value.copyTo(variant);
+    }
+};
+
+#endif // COMVariantSetter
diff --git a/Source/WebKit/win/ChangeLog b/Source/WebKit/win/ChangeLog
index 5540ab3..870b692 100644
--- a/Source/WebKit/win/ChangeLog
+++ b/Source/WebKit/win/ChangeLog
@@ -1,3 +1,443 @@
+2011-03-30  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Dirk Schulze.
+
+        [Cairo] Better separate the concerns of GraphicsContextCairo
+        https://bugs.webkit.org/show_bug.cgi?id=55150
+
+        * WebFrame.cpp:
+        (hdcFromContext): Modify this method to take PlatformContextCairo
+        instead of a cairo_t.
+        (WebFrame::spoolPage): Update to reflect new platform context.
+        (WebFrame::spoolPages): Ditto.
+        * WebFrame.h: Ditto.
+
+2011-03-30  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Update Windows production build logic for new production configurations
+        https://bugs.webkit.org/show_bug.cgi?id=57494
+
+        * WebKit.vcproj/InterfacesProduction.vsprops:
+        * WebKit.vcproj/WebKit.make:
+        * WebKit.vcproj/WebKitGUIDProduction.vsprops:
+        * WebKit.vcproj/WebKitLibProduction.vsprops:
+
+2011-03-30  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Rename Windows configuration Release_LTCG to Production for clarity
+        https://bugs.webkit.org/show_bug.cgi?id=57465
+
+        * WebKit.vcproj/Interfaces.vcproj:
+        * WebKit.vcproj/InterfacesProduction.vsprops: Copied from Source/WebKit/win/WebKit.vcproj/InterfacesReleaseLTCG.vsprops.
+        * WebKit.vcproj/InterfacesReleaseLTCG.vsprops: Removed.
+        * WebKit.vcproj/WebKit.sln:
+        * WebKit.vcproj/WebKit.submit.sln:
+        * WebKit.vcproj/WebKit.vcproj:
+        * WebKit.vcproj/WebKitGUID.vcproj:
+        * WebKit.vcproj/WebKitGUIDProduction.vsprops: Copied from Source/WebKit/win/WebKit.vcproj/WebKitGUIDReleaseLTCG.vsprops.
+        * WebKit.vcproj/WebKitGUIDReleaseLTCG.vsprops: Removed.
+        * WebKit.vcproj/WebKitLibProduction.vsprops: Copied from Source/WebKit/win/WebKit.vcproj/WebKitLibReleaseLTCG.vsprops.
+        * WebKit.vcproj/WebKitLibReleaseLTCG.vsprops: Removed.
+
+2011-03-29  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        [WIN] Remove unused GEN_DOMObject files
+        https://bugs.webkit.org/show_bug.cgi?id=57370
+
+        * GEN_DOMObject.cpp: Removed.
+        * GEN_DOMObject.h: Removed.
+
+2011-03-29  Steve Falkenburg  <sfalken@apple.com>
+
+        More build fix.
+
+        * WebCoreSupport/WebPlatformStrategies.h:
+
+2011-03-29  Steve Falkenburg  <sfalken@apple.com>
+
+        Build fix.
+
+        * WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebPlatformStrategies::contextMenuItemTagLookUpInDictionary):
+
+2011-03-29  Patrick Gansterer  <paroga@webkit.org>
+
+        Unreviewed. Try to fix Windows build.
+
+        * DOMEventsClasses.cpp: Added initguid.h again.
+
+2011-03-29  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        [WIN] Cleanup includes in WebKit files
+        https://bugs.webkit.org/show_bug.cgi?id=57381
+
+        Add missing includes to fix build without precompiled header.
+        Also fix paths in #include statements (e.g. WTF -> wtf).
+
+        * AccessibleBase.h:
+        * AccessibleDocument.h: Replace using statement with a qualified name.
+        * CFDictionaryPropertyBag.h:
+        * DOMEventsClasses.cpp:
+        * DOMHTMLClasses.h:
+        * DefaultDownloadDelegate.cpp:
+        * DefaultDownloadDelegate.h:
+        * DefaultPolicyDelegate.cpp:
+        * DefaultPolicyDelegate.h:
+        * WebCoreSupport/EmbeddedWidget.h:
+        * WebCoreSupport/WebInspectorDelegate.h:
+        * WebDataSource.h:
+        * WebDatabaseManager.h:
+        * WebElementPropertyBag.h:
+        * WebFramePolicyListener.h:
+        * WebGeolocationPolicyListener.h:
+        * WebHistory.h:
+        * WebKitClassFactory.h:
+        * WebScriptWorld.h:
+        * WebSerializedJSValue.h:
+        * WebUserContentURLPattern.h:
+
+2011-03-29  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Use per-configuration vsprops in WebKit to avoid WebKitVSPropsRedirectionDir removal by MSVC IDE
+        https://bugs.webkit.org/show_bug.cgi?id=57383
+
+        Visual Studio's IDE was removing instances of $(WebKitVSPropsRedirectionDir) from
+        InheritedPropertySheet rules in our vcproj files when the vcproj was edited from within
+        the IDE. To avoid this, add a separate vsprops file for each project configuration that
+        contains the required inherited property sheets.
+
+        * WebKit.vcproj/Interfaces.vcproj:
+        * WebKit.vcproj/InterfacesDebug.vsprops: Added.
+        * WebKit.vcproj/InterfacesDebugAll.vsprops: Added.
+        * WebKit.vcproj/InterfacesDebugCairoCFLite.vsprops: Added.
+        * WebKit.vcproj/InterfacesRelease.vsprops: Added.
+        * WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops: Added.
+        * WebKit.vcproj/InterfacesReleaseLTCG.vsprops: Added.
+        * WebKit.vcproj/WebKit.vcproj:
+        * WebKit.vcproj/WebKitGUID.vcproj:
+        * WebKit.vcproj/WebKitGUIDDebug.vsprops: Added.
+        * WebKit.vcproj/WebKitGUIDDebugAll.vsprops: Added.
+        * WebKit.vcproj/WebKitGUIDDebugCairoCFLite.vsprops: Added.
+        * WebKit.vcproj/WebKitGUIDRelease.vsprops: Added.
+        * WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops: Added.
+        * WebKit.vcproj/WebKitGUIDReleaseLTCG.vsprops: Added.
+        * WebKit.vcproj/WebKitLibDebug.vsprops: Added.
+        * WebKit.vcproj/WebKitLibDebugAll.vsprops: Added.
+        * WebKit.vcproj/WebKitLibDebugCairoCFLite.vsprops: Added.
+        * WebKit.vcproj/WebKitLibRelease.vsprops: Added.
+        * WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops: Added.
+        * WebKit.vcproj/WebKitLibReleaseLTCG.vsprops: Added.
+
+2011-03-29  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        Remove #pragma warning push and pop statements
+        https://bugs.webkit.org/show_bug.cgi?id=57198
+
+        We do not need to disable warnings via #pragma since we started
+        compiling WebCore with the same compiler warnings flags as WebKit.
+
+        * DOMCSSClasses.cpp:
+        * DOMCoreClasses.cpp:
+        * DOMEventsClasses.cpp:
+        * DOMHTMLClasses.cpp:
+        * DefaultDownloadDelegate.cpp:
+        * DefaultPolicyDelegate.cpp:
+        * MarshallingHelpers.cpp:
+        * WebActionPropertyBag.cpp:
+        * WebActionPropertyBag.h:
+        * WebCache.cpp:
+        * WebCoreSupport/WebDragClient.cpp:
+        * WebCoreSupport/WebEditorClient.cpp:
+        * WebCoreSupport/WebEditorClient.h:
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        * WebCoreSupport/WebFrameLoaderClient.h:
+        * WebCoreSupport/WebInspectorClient.cpp:
+        * WebDocumentLoader.h:
+        * WebDownload.cpp:
+        * WebDownloadCFNet.cpp:
+        * WebDownloadCurl.cpp:
+        * WebElementPropertyBag.cpp:
+        * WebError.cpp:
+        * WebError.h:
+        * WebFrame.cpp:
+        * WebFrame.h:
+        * WebFramePolicyListener.cpp:
+        * WebFramePolicyListener.h:
+        * WebHistory.cpp:
+        * WebHistoryItem.cpp:
+        * WebIconDatabase.cpp:
+        * WebIconDatabase.h:
+        * WebInspector.cpp:
+        * WebJavaScriptCollector.cpp:
+        * WebKitGraphics.cpp:
+        * WebKitSystemBits.cpp:
+        * WebLocalizableStrings.cpp:
+        * WebMutableURLRequest.cpp:
+        * WebMutableURLRequest.h:
+        * WebNodeHighlight.cpp:
+        * WebNodeHighlight.h:
+        * WebNotificationCenter.cpp:
+        * WebResource.cpp:
+        * WebResource.h:
+        * WebScrollBar.cpp:
+        * WebScrollBar.h:
+        * WebURLAuthenticationChallenge.cpp:
+        * WebURLAuthenticationChallenge.h:
+        * WebURLAuthenticationChallengeSender.cpp:
+        * WebURLAuthenticationChallengeSenderCFNet.cpp:
+        * WebURLAuthenticationChallengeSenderCurl.cpp:
+        * WebURLCredential.cpp:
+        * WebURLCredential.h:
+        * WebURLProtectionSpace.cpp:
+        * WebURLProtectionSpace.h:
+        * WebURLResponse.cpp:
+        * WebURLResponse.h:
+
+2011-03-29  Brent Fulgham  <bfulgham@webkit.org>
+
+        Unreviewed build fix after r82247.
+
+        * WebMutableURLRequest.cpp: The new CertificateCFWin routines
+        are not CFNetwork-specific. All CF-based ports can use them.
+
+2011-03-29  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        [WIN] Use WCHAR instead of TCHAR
+        https://bugs.webkit.org/show_bug.cgi?id=57191
+
+        We always use the UNICODE versions of windows functions, so
+        the usage of TCHAR makes no sense and mixing them is bad style.
+
+        * DefaultDownloadDelegate.cpp:
+        * WebCoreSupport/WebChromeClient.cpp:
+        * WebCoreSupport/WebContextMenuClient.cpp:
+        * WebCoreSupport/WebInspectorClient.cpp:
+        * WebKitDLL.cpp:
+        * WebNotificationCenter.cpp:
+        * WebPreferences.cpp:
+        * WebURLResponse.cpp:
+        * WebView.cpp:
+
+2011-03-29  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Jon Honeycutt.
+
+        Add WebCore::copyCertificateToData() on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=57296
+
+        Remove duplicate code that implemented this functionality in WebMutableURLRequest.cpp and use WebCore::copyCertificateToData() instead. 
+
+        * WebMutableURLRequest.cpp:
+        (WebMutableURLRequest::setClientCertificate):  Use WebCore::copyCertificateToData().
+
+2011-03-28  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Roben.
+
+        [WIN] Remove unused DOMCreateInstance files
+        https://bugs.webkit.org/show_bug.cgi?id=57193
+
+        * DOMCreateInstance.cpp: Removed.
+        * DOMCreateInstance.h: Removed.
+
+2011-03-28  Adele Peterson  <adele@apple.com>
+
+        Build fix.
+        
+        * WebFrame.cpp: (WebFrame::hasSpellingMarker):
+        Call new selectionStartHasMarkerFor method instead of selectionStartHasSpellingMarkerFor.
+
+2011-03-28  Jeff Miller  <jeffm@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Include certificate when sending a WebCore::ResourceError to UI process on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=57195
+        
+        Rename callers of wkGetSSLPeerCertificateData() to use wkGetSSLPeerCertificateDataBytePtr(), since it returns a void*.
+
+        * WebError.cpp:
+        (WebError::sslPeerCertificate):
+        * WebURLResponse.cpp:
+        (WebURLResponse::sslPeerCertificate):
+
+2011-03-28  Darin Adler  <darin@apple.com>
+
+        Set eol-style to native on more files. I noticed the last check-in had an entire file
+        changing because of an EOL style change, and setting this property prevents that from
+        happening in future. We may want to do this systematically for more of WebKit later.
+
+        * AccessibleBase.cpp: Added property svn:eol-style.
+        * AccessibleBase.h: Added property svn:eol-style.
+        * AccessibleDocument.cpp: Added property svn:eol-style.
+        * AccessibleDocument.h: Added property svn:eol-style.
+        * AccessibleImage.cpp: Added property svn:eol-style.
+        * AccessibleImage.h: Added property svn:eol-style.
+        * COMVariantSetter.h: Added property svn:eol-style.
+        * FullscreenVideoController.cpp: Added property svn:eol-style.
+        * FullscreenVideoController.h: Added property svn:eol-style.
+        * WebCoreSupport/EmbeddedWidget.cpp: Added property svn:eol-style.
+        * WebCoreSupport/EmbeddedWidget.h: Added property svn:eol-style.
+        * WebCoreSupport/WebDesktopNotificationsDelegate.cpp: Added property svn:eol-style.
+        * WebCoreSupport/WebDesktopNotificationsDelegate.h: Added property svn:eol-style.
+        * WebCoreSupport/WebFrameLoaderClient.cpp: Added property svn:eol-style.
+        * WebCoreSupport/WebInspectorDelegate.cpp: Added property svn:eol-style.
+        * WebCoreSupport/WebInspectorDelegate.h: Added property svn:eol-style.
+        * WebCoreSupport/WebPlatformStrategies.cpp: Added property svn:eol-style.
+        * WebCoreSupport/WebPlatformStrategies.h: Added property svn:eol-style.
+        * WebCoreSupport/WebPluginHalterClient.cpp: Added property svn:eol-style.
+        * WebCoreSupport/WebPluginHalterClient.h: Added property svn:eol-style.
+
+2011-03-28  Patrick Gansterer  <paroga@webkit.org>
+
+        Unreviewed build fix.
+
+        * COMPropertyBag.h: Added missing include.
+        * WebKitCOMAPI.h: Ditto.
+        * WebCoreSupport/WebFrameLoaderClient.h: Added missing forward declaration.
+
+2011-03-25  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Jon Honeycutt.
+
+        WebScrollBar not updating when calling WebScrollBar::setValue.
+        <rdar://problem/9143871>
+
+        * WebScrollBar.cpp:
+        (WebScrollBar::setValue):
+        Call scrollToOffsetWithoutAnimation to actually update the scroll position.
+
+2011-03-25  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Adele Peterson.
+
+        REGRESSION (r70748): latest nightly builds kills AC_QuickTime.js
+        https://bugs.webkit.org/show_bug.cgi?id=49016
+
+        Update objectContentType() implementation to handle the
+        shouldPreferPlugInsForImages flag.
+
+        * WebFrame.cpp:
+        (WebFrame::objectContentType):
+        * WebFrame.h:
+
+2011-03-24  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r81916 and r81917.
+        http://trac.webkit.org/changeset/81916
+        http://trac.webkit.org/changeset/81917
+        https://bugs.webkit.org/show_bug.cgi?id=57071
+
+        broke a test on platforms that do not have QuickTime installed
+        (Requested by estes on #webkit).
+
+        * WebFrame.cpp:
+        (WebFrame::objectContentType):
+        * WebFrame.h:
+
+2011-03-24  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION (r70748): latest nightly builds kills AC_QuickTime.js
+        https://bugs.webkit.org/show_bug.cgi?id=49016
+
+        Update objectContentType() implementation to handle the
+        shouldPreferPlugInsForImages flag.
+
+        * WebFrame.cpp:
+        (WebFrame::objectContentType):
+        * WebFrame.h:
+
+2011-03-23  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Change IconDatabase opening to allow for arbitrary filenames
+        https://bugs.webkit.org/show_bug.cgi?id=56977
+
+        * WebIconDatabase.cpp:
+        (WebIconDatabase::startUpIconDatabase):
+
+2011-03-22  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        <rdar://problem/8648311> and https://bugs.webkit.org/show_bug.cgi?id=56876
+        WK2 Icon DB: Expand IconDatabaseClient interface and move it to the main thread
+
+        Note that while the new client calls always come through on the main thread, our mechanisms to
+        route dispatches to the main thread are still valid and will still work.
+
+        Update to the new IconDatabaseClient interface:
+        * WebIconDatabase.cpp:
+        (WebIconDatabase::performImport):
+        (WebIconDatabase::didRemoveAllIcons):
+        (WebIconDatabase::didImportIconURLForPageURL):
+        (WebIconDatabase::didImportIconDataForPageURL):
+        (WebIconDatabase::didChangeIconForPageURL):
+        (WebIconDatabase::didFinishURLImport):
+        * WebIconDatabase.h:
+
+2011-03-17  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        https://bugs.webkit.org/show_bug.cgi?id=56425
+        More groundwork for WebKit2 IconDatabase
+
+        Update already-used function names:
+        * WebIconDatabase.cpp:
+        (WebIconDatabase::iconForURL):
+        (WebIconDatabase::iconURLForURL):
+        (WebIconDatabase::hasIconForURL):
+
+2011-03-18  Pavel Podivilov  <podivilov@chromium.org>
+
+        Reviewed by Yury Semikhatsky.
+
+        Web Inspector: implement inspector session storage.
+        https://bugs.webkit.org/show_bug.cgi?id=56643
+
+        * WebCoreSupport/WebInspectorClient.cpp:
+        (WebInspectorClient::saveSessionSetting):
+        (WebInspectorClient::loadSessionSetting):
+        (WebInspectorFrontendClient::saveSessionSetting):
+        (WebInspectorFrontendClient::loadSessionSetting):
+        * WebCoreSupport/WebInspectorClient.h:
+
+2011-03-11  Brady Eidson  <beidson@apple.com>
+
+        More Windows build fix for https://bugs.webkit.org/show_bug.cgi?id=56216
+
+        * WebCoreStatistics.cpp:
+        * WebIconDatabase.cpp:
+
+2011-03-09  Peter Kasting  <pkasting@google.com>
+
+        Reviewed by Mihai Parparita.
+
+        Unify Windows version checks.
+        https://bugs.webkit.org/show_bug.cgi?id=55979
+
+        * WebView.cpp:
+        (WebView::standardUserAgentWithApplicationName):
+        (webKitVersionString):
+
 2011-03-07  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/Source/WebKit/win/DOMCSSClasses.cpp b/Source/WebKit/win/DOMCSSClasses.cpp
index b89053b..0220031 100644
--- a/Source/WebKit/win/DOMCSSClasses.cpp
+++ b/Source/WebKit/win/DOMCSSClasses.cpp
@@ -27,9 +27,7 @@
 #include "WebKitDLL.h"
 #include "DOMCSSClasses.h"
 
-#pragma warning(push, 0)
 #include <WebCore/PlatformString.h>
-#pragma warning(pop)
 
 // DOMCSSStyleDeclaration - DOMCSSStyleDeclaration ----------------------------
 
diff --git a/Source/WebKit/win/DOMCoreClasses.cpp b/Source/WebKit/win/DOMCoreClasses.cpp
index c6b8823..b0a6031 100644
--- a/Source/WebKit/win/DOMCoreClasses.cpp
+++ b/Source/WebKit/win/DOMCoreClasses.cpp
@@ -33,7 +33,6 @@
 #include "DOMHTMLClasses.h"
 #include "WebKitGraphics.h"
 
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/DOMWindow.h>
 #include <WebCore/Document.h>
@@ -49,7 +48,6 @@
 #include <WebCore/NodeList.h>
 #include <WebCore/RenderObject.h>
 #include <WebCore/RenderTreeAsText.h>
-#pragma warning(pop)
 
 #include <initguid.h>
 // {3B0C0EFF-478B-4b0b-8290-D2321E08E23E}
diff --git a/Source/WebKit/win/DOMCreateInstance.cpp b/Source/WebKit/win/DOMCreateInstance.cpp
deleted file mode 100644
index ebaa4ce..0000000
--- a/Source/WebKit/win/DOMCreateInstance.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
- * Copyright (C) 2007 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.
- * 3.  Neither the name of Apple Computer, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-// This file is a temporary hack to implement the createInstance methods for
-// the COM DOM bindings.
-
-#include "config.h"
-#include "DOMCreateInstance.h"
-
-#include "GEN_DOMNode.h"
-#include "GEN_DOMElement.h"
-#include "GEN_DOMDocument.h"
-#include "GEN_DOMAttr.h"
-#include "GEN_DOMText.h"
-#include "GEN_DOMCDATASection.h"
-#include "GEN_DOMEntityReference.h"
-#include "GEN_DOMEntity.h"
-#include "GEN_DOMProcessingInstruction.h"
-#include "GEN_DOMComment.h"
-#include "GEN_DOMHTMLElement.h"
-#include "GEN_DOMHTMLDocument.h"
-#include "GEN_DOMHTMLCollection.h"
-#include "GEN_DOMDocumentType.h"
-#include "GEN_DOMDocumentFragment.h"
-#include "GEN_DOMNotation.h"
-#include "GEN_DOMCSSCharsetRule.h"
-#include "GEN_DOMCSSFontFaceRule.h"
-#include "GEN_DOMCSSImportRule.h"
-#include "GEN_DOMCSSMediaRule.h"
-#include "GEN_DOMCSSPageRule.h"
-#include "GEN_DOMCSSPrimitiveValue.h"
-#include "GEN_DOMCSSRule.h"
-#include "GEN_DOMCSSRuleList.h"
-#include "GEN_DOMCSSStyleDeclaration.h"
-#include "GEN_DOMCSSStyleRule.h"
-#include "GEN_DOMCSSStyleSheet.h"
-#include "GEN_DOMCSSValueList.h"
-#include "GEN_DOMStyleSheet.h"
-#include "GEN_DOMDOMImplementation.h"
-#include "GEN_DOMNamedNodeMap.h"
-#include "GEN_DOMNodeList.h"
-#include "GEN_DOMCounter.h"
-#include "GEN_DOMCSSRuleList.h"
-#include "GEN_DOMCSSStyleDeclaration.h"
-#include "GEN_DOMMediaList.h"
-#include "GEN_DOMRect.h"
-#include "GEN_DOMStyleSheet.h"
-#include "GEN_DOMStyleSheetList.h"
-#include "GEN_DOMEvent.h"
-#include "GEN_DOMEvent.h"
-#include <wtf/HashMap.h>
-
-#pragma warning(push, 0)
-#include <WebCore/Node.h>
-#include <WebCore/Element.h>
-#include <WebCore/Document.h>
-#include <WebCore/Attr.h>
-#include <WebCore/Text.h>
-#include <WebCore/COMPtr.h>
-#include <WebCore/CDATASection.h>
-#include <WebCore/EntityReference.h>
-#include <WebCore/Entity.h>
-#include <WebCore/ProcessingInstruction.h>
-#include <WebCore/Comment.h>
-#include <WebCore/HTMLDocument.h>
-#include <WebCore/HTMLElement.h>
-#include <WebCore/HTMLCollection.h>
-#include <WebCore/DocumentType.h>
-#include <WebCore/DocumentFragment.h>
-#include <WebCore/Notation.h>
-#include <WebCore/CSSCharsetRule.h>
-#include <WebCore/CSSFontFaceRule.h>
-#include <WebCore/CSSImportRule.h>
-#include <WebCore/CSSMediaRule.h>
-#include <WebCore/CSSPageRule.h>
-#include <WebCore/CSSPrimitiveValue.h>
-#include <WebCore/CSSRule.h>
-#include <WebCore/CSSRuleList.h>
-#include <WebCore/CSSStyleDeclaration.h>
-#include <WebCore/CSSStyleRule.h>
-#include <WebCore/CSSStyleSheet.h>
-#include <WebCore/CSSValueList.h>
-#include <WebCore/StyleSheet.h>
-#include <WebCore/DOMImplementation.h>
-#include <WebCore/NamedNodeMap.h>
-#include <WebCore/NodeList.h>
-#include <WebCore/Counter.h>
-#include <WebCore/CSSRuleList.h>
-#include <WebCore/CSSStyleDeclaration.h>
-#include <WebCore/MediaList.h>
-#include <WebCore/Rect.h>
-#include <WebCore/StyleSheet.h>
-#include <WebCore/StyleSheetList.h>
-#include <WebCore/Event.h>
-#include <WebCore/EventListener.h>
-#pragma warning(pop)
-
-typedef HashMap<void*, GEN_DOMObject*> DOMWrapperCache;
-
-static DOMWrapperCache& domWrapperCache()
-{
-    static DOMWrapperCache cache;
-    return cache;
-}
-
-GEN_DOMObject* getDOMWrapper(void* objectHandle)
-{
-    return domWrapperCache().get(objectHandle);
-}
-
-void setDOMWrapper(void* objectHandle, GEN_DOMObject* wrapper)
-{
-    domWrapperCache().set(objectHandle, wrapper);
-}
-
-void removeDOMWrapper(void* objectHandle)
-{
-    domWrapperCache().remove(objectHandle);
-}
-
-#define COM_DOM_PREFIX(Type) GEN_DOM##Type
-#define CREATE_ONLY_SELF(Type) \
-    COM_DOM_PREFIX(Type)* COM_DOM_PREFIX(Type)::createInstance(WebCore::Type* impl) \
-    { \
-        if (!impl) \
-            return 0; \
-        if (GEN_DOMObject* cachedInstance = getDOMWrapper(impl)) { \
-            cachedInstance->AddRef(); \
-            return static_cast<COM_DOM_PREFIX(Type)*>(cachedInstance); \
-        } \
-        COMPtr<COM_DOM_PREFIX(Type)> comDOMObject = new COM_DOM_PREFIX(Type)(impl); \
-        setDOMWrapper(impl, comDOMObject.get()); \
-        return comDOMObject.releaseRef(); \
-    } \
-
-// Core
-
-GEN_DOMNode* GEN_DOMNode::createInstance(WebCore::Node* node)
-{
-    if (!node)
-        return 0;
-
-    if (GEN_DOMObject* cachedInstance = getDOMWrapper(node)) {
-        cachedInstance->AddRef();
-        return static_cast<GEN_DOMNode*>(cachedInstance);
-    }
-
-    COMPtr<GEN_DOMNode> domNode;
-    switch (node->nodeType()) {
-        case WebCore::Node::ELEMENT_NODE:
-            // FIXME: add support for creating subclasses of HTMLElement.
-            // FIXME: add support for creating SVGElements and its subclasses.
-            if (node->isHTMLElement())
-                domNode = new GEN_DOMHTMLElement(static_cast<WebCore::HTMLElement*>(node));
-            else
-                domNode = new GEN_DOMElement(static_cast<WebCore::Element*>(node));
-            break;
-        case WebCore::Node::ATTRIBUTE_NODE:
-            domNode = new GEN_DOMAttr(static_cast<WebCore::Attr*>(node));
-            break;
-        case WebCore::Node::TEXT_NODE:
-            domNode = new GEN_DOMText(static_cast<WebCore::Text*>(node));
-            break;
-        case WebCore::Node::CDATA_SECTION_NODE:
-            domNode = new GEN_DOMCDATASection(static_cast<WebCore::CDATASection*>(node));
-            break;
-        case WebCore::Node::ENTITY_REFERENCE_NODE:
-            domNode = new GEN_DOMEntityReference(static_cast<WebCore::EntityReference*>(node));
-            break;
-        case WebCore::Node::ENTITY_NODE:
-            domNode = new GEN_DOMEntity(static_cast<WebCore::Entity*>(node));
-            break;
-        case WebCore::Node::PROCESSING_INSTRUCTION_NODE:
-            domNode = new GEN_DOMProcessingInstruction(static_cast<WebCore::ProcessingInstruction*>(node));
-            break;
-        case WebCore::Node::COMMENT_NODE:
-            domNode = new GEN_DOMComment(static_cast<WebCore::Comment*>(node));
-            break;
-        case WebCore::Node::DOCUMENT_NODE:
-            // FIXME: add support for SVGDocument.
-            if (static_cast<WebCore::Document*>(node)->isHTMLDocument())
-                domNode = new GEN_DOMHTMLDocument(static_cast<WebCore::HTMLDocument*>(node));
-            else
-                domNode = new GEN_DOMDocument(static_cast<WebCore::Document*>(node));
-            break;
-        case WebCore::Node::DOCUMENT_TYPE_NODE:
-            domNode = new GEN_DOMDocumentType(static_cast<WebCore::DocumentType*>(node));
-            break;
-        case WebCore::Node::DOCUMENT_FRAGMENT_NODE:
-            domNode = new GEN_DOMDocumentFragment(static_cast<WebCore::DocumentFragment*>(node));
-            break;
-        case WebCore::Node::NOTATION_NODE:
-            domNode = new GEN_DOMNotation(static_cast<WebCore::Notation*>(node));
-            break;
-        default:
-            domNode = new GEN_DOMNode(node);
-            break;
-    }
-
-    setDOMWrapper(node, domNode.get());
-    return domNode.releaseRef();
-}
-
-GEN_DOMImplementation* GEN_DOMImplementation::createInstance(WebCore::DOMImplementation* impl)
-{
-    if (!impl)
-        return 0;
-
-    if (GEN_DOMObject* cachedInstance = getDOMWrapper(impl)) {
-        cachedInstance->AddRef();
-        return static_cast<GEN_DOMImplementation*>(cachedInstance);
-    }
-
-    COMPtr<GEN_DOMImplementation> comDOMObject = new GEN_DOMImplementation(impl);
-    setDOMWrapper(impl, comDOMObject.get());
-    return comDOMObject.releaseRef();
-}
-
-CREATE_ONLY_SELF(NamedNodeMap)
-CREATE_ONLY_SELF(NodeList)
-
-// Events
-
-// FIXME: Add the subclasses for Event when they get generated.
-CREATE_ONLY_SELF(Event)
-
-
-// CSS
-
-GEN_DOMCSSRule* GEN_DOMCSSRule::createInstance(WebCore::CSSRule* rule)
-{
-    if (!rule)
-        return 0;
-
-    if (GEN_DOMObject* cachedInstance = getDOMWrapper(rule)) {
-        cachedInstance->AddRef();
-        return static_cast<GEN_DOMCSSRule*>(cachedInstance);
-    }
-
-    COMPtr<GEN_DOMCSSRule> domRule;
-    switch (rule->type()) {
-        case WebCore::CSSRule::STYLE_RULE:
-            domRule = new GEN_DOMCSSStyleRule(static_cast<WebCore::CSSStyleRule*>(rule));
-            break;
-        case WebCore::CSSRule::CHARSET_RULE:
-            domRule = new GEN_DOMCSSCharsetRule(static_cast<WebCore::CSSCharsetRule*>(rule));
-            break;
-        case WebCore::CSSRule::IMPORT_RULE:
-            domRule = new GEN_DOMCSSImportRule(static_cast<WebCore::CSSImportRule*>(rule));
-            break;
-        case WebCore::CSSRule::MEDIA_RULE:
-            domRule = new GEN_DOMCSSMediaRule(static_cast<WebCore::CSSMediaRule*>(rule));
-            break;
-        case WebCore::CSSRule::FONT_FACE_RULE:
-            domRule = new GEN_DOMCSSFontFaceRule(static_cast<WebCore::CSSFontFaceRule*>(rule));
-            break;
-        case WebCore::CSSRule::PAGE_RULE:
-            domRule = new GEN_DOMCSSPageRule(static_cast<WebCore::CSSPageRule*>(rule));
-            break;
-        case WebCore::CSSRule::UNKNOWN_RULE:
-        default:
-            domRule = new GEN_DOMCSSRule(rule);
-            break;
-    }
-
-    setDOMWrapper(rule, domRule.get());
-    return domRule.releaseRef();
-}
-
-GEN_DOMStyleSheet* GEN_DOMStyleSheet::createInstance(WebCore::StyleSheet* styleSheet)
-{
-    if (!styleSheet)
-        return 0;
-
-    if (GEN_DOMObject* cachedInstance = getDOMWrapper(styleSheet)) {
-        cachedInstance->AddRef();
-        return static_cast<GEN_DOMStyleSheet*>(cachedInstance);
-    }
-
-    COMPtr<GEN_DOMStyleSheet> domStyleSheet;
-    if (styleSheet->isCSSStyleSheet())
-        domStyleSheet = new GEN_DOMCSSStyleSheet(static_cast<WebCore::CSSStyleSheet*>(styleSheet));
-    else
-        domStyleSheet = new GEN_DOMStyleSheet(styleSheet);
-
-    setDOMWrapper(styleSheet, domStyleSheet.get());
-    return domStyleSheet.releaseRef();
-}
-
-
-GEN_DOMCSSValue* GEN_DOMCSSValue::createInstance(WebCore::CSSValue* value)
-{
-    if (!value)
-        return 0;
-
-    if (GEN_DOMObject* cachedInstance = getDOMWrapper(value)) {
-        cachedInstance->AddRef();
-        return static_cast<GEN_DOMCSSValue*>(cachedInstance);
-    }
-
-    COMPtr<GEN_DOMCSSValue> domValue;
-    switch (value->cssValueType()) {
-        case WebCore::CSSValue::CSS_PRIMITIVE_VALUE:
-            domValue = new GEN_DOMCSSPrimitiveValue(static_cast<WebCore::CSSPrimitiveValue*>(value));
-            break;
-        case WebCore::CSSValue::CSS_VALUE_LIST:
-            domValue = new GEN_DOMCSSValueList(static_cast<WebCore::CSSValueList*>(value));
-            break;
-        case WebCore::CSSValue::CSS_INHERIT:
-            domValue = new GEN_DOMCSSValue(value);
-            break;
-        case WebCore::CSSValue::CSS_CUSTOM:
-            // FIXME: add support for SVGPaint and SVGColor
-            domValue = new GEN_DOMCSSValue(value);
-            break;
-    }
-
-    setDOMWrapper(value, domValue.get());
-    return domValue.releaseRef();
-}
-
-CREATE_ONLY_SELF(Counter)
-CREATE_ONLY_SELF(CSSRuleList)
-CREATE_ONLY_SELF(CSSStyleDeclaration)
-CREATE_ONLY_SELF(MediaList)
-CREATE_ONLY_SELF(Rect)
-CREATE_ONLY_SELF(StyleSheetList)
-
-
-// HTML
-
-CREATE_ONLY_SELF(HTMLCollection)
diff --git a/Source/WebKit/win/DOMCreateInstance.h b/Source/WebKit/win/DOMCreateInstance.h
deleted file mode 100644
index a733e84..0000000
--- a/Source/WebKit/win/DOMCreateInstance.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2007 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.
- * 3.  Neither the name of Apple Computer, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef DOMCreateInstance_h
-#define DOMCreateInstance_h
-
-class GEN_DOMObject;
-
-GEN_DOMObject* getDOMWrapper(void* objectHandle);
-void setDOMWrapper(void* objectHandle, GEN_DOMObject* wrapper);
-void removeDOMWrapper(void* objectHandle);
-
-#endif // DOMCreateInstance_h
diff --git a/Source/WebKit/win/DOMEventsClasses.cpp b/Source/WebKit/win/DOMEventsClasses.cpp
index 11e14b3..9980734 100644
--- a/Source/WebKit/win/DOMEventsClasses.cpp
+++ b/Source/WebKit/win/DOMEventsClasses.cpp
@@ -28,12 +28,10 @@
 #include <initguid.h>
 #include "DOMEventsClasses.h"
 
-#pragma warning( push, 0 )
 #include <WebCore/DOMWindow.h>
 #include <WebCore/Event.h>
 #include <WebCore/KeyboardEvent.h>
 #include <WebCore/MouseEvent.h>
-#pragma warning( pop )
 
 // DOMEventListener -----------------------------------------------------------
 
diff --git a/Source/WebKit/win/DOMHTMLClasses.cpp b/Source/WebKit/win/DOMHTMLClasses.cpp
index 7fe2748..c163ec4 100644
--- a/Source/WebKit/win/DOMHTMLClasses.cpp
+++ b/Source/WebKit/win/DOMHTMLClasses.cpp
@@ -29,7 +29,6 @@
 #include "COMPtr.h"
 #include "WebFrame.h"
 
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/Document.h>
 #include <WebCore/Element.h>
@@ -47,7 +46,6 @@
 #include <WebCore/IntRect.h>
 #include <WebCore/RenderObject.h>
 #include <WebCore/RenderTextControl.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 using namespace HTMLNames;
diff --git a/Source/WebKit/win/DOMHTMLClasses.h b/Source/WebKit/win/DOMHTMLClasses.h
index baeecc9..34c7951 100644
--- a/Source/WebKit/win/DOMHTMLClasses.h
+++ b/Source/WebKit/win/DOMHTMLClasses.h
@@ -28,9 +28,7 @@
 
 #include "WebKit.h"
 #include "DOMCoreClasses.h"
-#include "WebScriptObject.h"
-
-#include <WTF/RefPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebCore {
     class HTMLCollection;
diff --git a/Source/WebKit/win/DefaultDownloadDelegate.cpp b/Source/WebKit/win/DefaultDownloadDelegate.cpp
index 29da6a4..d9cc71c 100644
--- a/Source/WebKit/win/DefaultDownloadDelegate.cpp
+++ b/Source/WebKit/win/DefaultDownloadDelegate.cpp
@@ -30,14 +30,13 @@
 #include "WebKit.h"
 #include "WebKitLogging.h"
 #include "WebMutableURLRequest.h"
+#include <WebCore/COMPtr.h>
 #include <wtf/text/CString.h>
 
 #include <shlobj.h>
-#include <tchar.h>
+#include <wchar.h>
 
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
@@ -109,7 +108,7 @@ HRESULT STDMETHODCALLTYPE DefaultDownloadDelegate::decideDestinationWithSuggeste
 {
     LOG(Download, "DefaultDownloadDelegate %p - decideDestinationWithSuggestedFilename %s", download, String(filename, SysStringLen(filename)).ascii().data());
 
-    TCHAR pathChars[MAX_PATH];
+    WCHAR pathChars[MAX_PATH];
     if (FAILED(SHGetFolderPath(0, CSIDL_DESKTOPDIRECTORY  | CSIDL_FLAG_CREATE, 0, 0, pathChars))) {
         if (FAILED(download->setDestination(filename, true))) {
             LOG_ERROR("Failed to set destination on file");
@@ -118,14 +117,14 @@ HRESULT STDMETHODCALLTYPE DefaultDownloadDelegate::decideDestinationWithSuggeste
         return S_OK;
     }
 
-    size_t fullLength = _tcslen(pathChars) + SysStringLen(filename) + 2;
+    size_t fullLength = wcslen(pathChars) + SysStringLen(filename) + 2;
     BSTR full = SysAllocStringLen(0, (UINT)fullLength);
     if (!full)
         return E_OUTOFMEMORY;
 
-    _tcscpy_s(full, fullLength, pathChars);
-    _tcscat_s(full, fullLength, _T("\\"));
-    _tcscat_s(full, fullLength, filename);
+    wcscpy_s(full, fullLength, pathChars);
+    wcscat_s(full, fullLength, L"\\");
+    wcscat_s(full, fullLength, filename);
     BString fullPath;
     fullPath.adoptBSTR(full);
 
diff --git a/Source/WebKit/win/DefaultDownloadDelegate.h b/Source/WebKit/win/DefaultDownloadDelegate.h
index b8fb8a7..b670381 100644
--- a/Source/WebKit/win/DefaultDownloadDelegate.h
+++ b/Source/WebKit/win/DefaultDownloadDelegate.h
@@ -25,7 +25,6 @@
 #ifndef DefaultDownloadDelegate_h
 #define DefaultDownloadDelegate_h
 
-#include "COMPtr.h"
 #include "WebKit.h"
 #include <wtf/HashSet.h>
 
diff --git a/Source/WebKit/win/DefaultPolicyDelegate.cpp b/Source/WebKit/win/DefaultPolicyDelegate.cpp
index 67fc556..02d7bdb 100644
--- a/Source/WebKit/win/DefaultPolicyDelegate.cpp
+++ b/Source/WebKit/win/DefaultPolicyDelegate.cpp
@@ -27,11 +27,8 @@
 #include "WebKitDLL.h"
 #include "DefaultPolicyDelegate.h"
 
-#include "WebKit.h"
-
-#pragma warning(push, 0)
+#include <WebCore/COMPtr.h>
 #include <WebCore/PlatformString.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/DefaultPolicyDelegate.h b/Source/WebKit/win/DefaultPolicyDelegate.h
index 443cf8a..f894b38 100644
--- a/Source/WebKit/win/DefaultPolicyDelegate.h
+++ b/Source/WebKit/win/DefaultPolicyDelegate.h
@@ -26,7 +26,6 @@
 #ifndef DefaultPolicyDelegate_h
 #define DefaultPolicyDelegate_h
 
-#include "COMPtr.h"
 #include "WebKit.h"
 
 class DefaultPolicyDelegate : public IWebPolicyDelegate {
diff --git a/Source/WebKit/win/GEN_DOMObject.cpp b/Source/WebKit/win/GEN_DOMObject.cpp
deleted file mode 100644
index c8d0e3c..0000000
--- a/Source/WebKit/win/GEN_DOMObject.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2007 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.
- * 3.  Neither the name of Apple Computer, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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 "GEN_DOMObject.h"
-
-#include "WebKitDLL.h"
-
-#include <wtf/Assertions.h>
-
-// DOMObject ------------------------------------------------------------
-
-GEN_DOMObject::GEN_DOMObject()
-    : m_refCount(0)
-{
-    gClassCount++;
-    gClassNameCount.add("GEN_DOMObject");
-}
-
-GEN_DOMObject::~GEN_DOMObject()
-{
-    gClassCount--;
-    gClassNameCount.remove("GEN_DOMObject");
-}
-
-// IUnknown -------------------------------------------------------------------
-
-HRESULT STDMETHODCALLTYPE GEN_DOMObject::QueryInterface(REFIID riid, void** ppvObject)
-{
-    *ppvObject = 0;
-    if (IsEqualGUID(riid, IID_IUnknown))
-        *ppvObject = static_cast<IGEN_DOMObject*>(this);
-    else if (IsEqualGUID(riid, IID_IGEN_DOMObject))
-        *ppvObject = static_cast<GEN_DOMObject*>(this);
-    else
-        return E_NOINTERFACE;
-
-    AddRef();
-    return S_OK;
-}
-
-ULONG STDMETHODCALLTYPE GEN_DOMObject::AddRef()
-{
-    return ++m_refCount;
-}
-
-ULONG STDMETHODCALLTYPE GEN_DOMObject::Release()
-{
-    ULONG newRef = --m_refCount;
-    if (!newRef)
-        delete this;
-
-    return newRef;
-}
diff --git a/Source/WebKit/win/GEN_DOMObject.h b/Source/WebKit/win/GEN_DOMObject.h
deleted file mode 100644
index bb654fb..0000000
--- a/Source/WebKit/win/GEN_DOMObject.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2007 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.
- * 3.  Neither the name of Apple Computer, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
- */
-
-#ifndef GEN_DOMObject_h
-#define GEN_DOMObject_h
-
-#include "WebKit.h"
-
-class GEN_DOMObject : public IGEN_DOMObject {
-public:
-    // IUnknown
-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void** ppvObject);
-    virtual ULONG STDMETHODCALLTYPE AddRef();
-    virtual ULONG STDMETHODCALLTYPE Release();
-
-protected:
-    GEN_DOMObject();
-    virtual ~GEN_DOMObject();
-
-    ULONG m_refCount;
-};
-
-#endif // GEN_DOMObject_h
diff --git a/Source/WebKit/win/MarshallingHelpers.cpp b/Source/WebKit/win/MarshallingHelpers.cpp
index 0cec6de..b29804e 100644
--- a/Source/WebKit/win/MarshallingHelpers.cpp
+++ b/Source/WebKit/win/MarshallingHelpers.cpp
@@ -28,11 +28,9 @@
 #include "MarshallingHelpers.h"
 #include "MathExtras.h"
 
-#pragma warning(push, 0)
 #include <WebCore/IntRect.h>
 #include <WebCore/KURL.h>
 #include <WebCore/PlatformString.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebActionPropertyBag.cpp b/Source/WebKit/win/WebActionPropertyBag.cpp
index c2b9e10..b20da91 100644
--- a/Source/WebKit/win/WebActionPropertyBag.cpp
+++ b/Source/WebKit/win/WebActionPropertyBag.cpp
@@ -31,13 +31,10 @@
 #include "DOMCoreClasses.h"
 #include "WebElementPropertyBag.h"
 #include "WebKit.h"
-
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/EventHandler.h>
-#include <WebCore/MouseEvent.h>
 #include <WebCore/HitTestResult.h>
-#pragma warning(pop)
+#include <WebCore/MouseEvent.h>
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebActionPropertyBag.h b/Source/WebKit/win/WebActionPropertyBag.h
index 56f8f52..a32e9c5 100644
--- a/Source/WebKit/win/WebActionPropertyBag.h
+++ b/Source/WebKit/win/WebActionPropertyBag.h
@@ -27,12 +27,9 @@
 #define WebActionPropertyBag_h
 
 #include "ocidl.h"
-
-#pragma warning(push, 0)
 #include <WebCore/Frame.h>
 #include <WebCore/HTMLFormElement.h>
 #include <WebCore/NavigationAction.h>
-#pragma warning(pop)
 
 class WebActionPropertyBag : public IPropertyBag {
 public:
diff --git a/Source/WebKit/win/WebCache.cpp b/Source/WebKit/win/WebCache.cpp
index c7d0f31..dab1bcd 100644
--- a/Source/WebKit/win/WebCache.cpp
+++ b/Source/WebKit/win/WebCache.cpp
@@ -28,12 +28,9 @@
 #include "WebCache.h"
 
 #include "CFDictionaryPropertyBag.h"
-
-#pragma warning(push, 0)
 #include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/MemoryCache.h>
 #include <WebCore/CrossOriginPreflightResultCache.h>
-#pragma warning(pop)
 
 // WebCache ---------------------------------------------------------------------------
 
diff --git a/Source/WebKit/win/WebCoreStatistics.cpp b/Source/WebKit/win/WebCoreStatistics.cpp
index 7a9b126..0e30576 100644
--- a/Source/WebKit/win/WebCoreStatistics.cpp
+++ b/Source/WebKit/win/WebCoreStatistics.cpp
@@ -33,6 +33,7 @@
 #include <WebCore/GlyphPageTreeNode.h>
 #include <WebCore/IconDatabase.h>
 #include <WebCore/JSDOMWindow.h>
+#include <WebCore/SharedBuffer.h>
 
 using namespace JSC;
 using namespace WebCore;
diff --git a/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.h b/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.h
index ccd3451..abfe76e 100644
--- a/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.h
+++ b/Source/WebKit/win/WebCoreSupport/EmbeddedWidget.h
@@ -26,6 +26,7 @@
 #ifndef EmbeddedWidget_h
 #define EmbeddedWidget_h
 
+#include "WebKit.h"
 #include <WebCore/COMPtr.h>
 #include <WebCore/IntRect.h>
 #include <WebCore/PluginView.h>
diff --git a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp b/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
index 65537f4..1935c5f 100644
--- a/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebChromeClient.cpp
@@ -56,7 +56,7 @@
 #include <WebCore/PopupMenuWin.h>
 #include <WebCore/SearchPopupMenuWin.h>
 #include <WebCore/WindowFeatures.h>
-#include <tchar.h>
+#include <wchar.h>
 
 #if USE(ACCELERATED_COMPOSITING)
 #include <WebCore/GraphicsLayer.h>
@@ -591,8 +591,8 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
             uiDelegatePrivate->exceededDatabaseQuota(m_webView, kit(frame), origin.get(), BString(databaseIdentifier));
         else {
             // FIXME: remove this workaround once shipping Safari has the necessary delegate implemented.
-            TCHAR path[MAX_PATH];
-            HMODULE safariHandle = GetModuleHandle(TEXT("Safari.exe"));
+            WCHAR path[MAX_PATH];
+            HMODULE safariHandle = GetModuleHandleW(L"Safari.exe");
             if (!safariHandle)
                 return;
             GetModuleFileName(safariHandle, path, WTF_ARRAY_LENGTH(path));
@@ -606,9 +606,9 @@ void WebChromeClient::exceededDatabaseQuota(Frame* frame, const String& database
 
             LPCTSTR productVersion;
             UINT productVersionLength;
-            if (!VerQueryValue(data.data(), TEXT("\\StringFileInfo\\040904b0\\ProductVersion"), (void**)&productVersion, &productVersionLength))
+            if (!VerQueryValueW(data.data(), L"\\StringFileInfo\\040904b0\\ProductVersion", (void**)&productVersion, &productVersionLength))
                 return;
-            if (_tcsncmp(TEXT("3.1"), productVersion, productVersionLength) > 0) {
+            if (wcsncmp(L"3.1", productVersion, productVersionLength) > 0) {
                 const unsigned long long defaultQuota = 5 * 1024 * 1024; // 5 megabytes should hopefully be enough to test storage support.
                 origin->setQuota(defaultQuota);
             }
@@ -738,7 +738,7 @@ void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChoose
         return;
 
     bool multiFile = fileChooser->allowsMultipleFiles();
-    Vector<TCHAR> fileBuf(multiFile ? maxFilePathsListSize : MAX_PATH);
+    Vector<WCHAR> fileBuf(multiFile ? maxFilePathsListSize : MAX_PATH);
 
     OPENFILENAME ofn;
 
@@ -750,7 +750,7 @@ void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChoose
     ofn.lStructSize = sizeof(ofn);
     ofn.hwndOwner = viewWindow;
     String allFiles = allFilesText();
-    allFiles.append(TEXT("\0*.*\0\0"), 6);
+    allFiles.append(L"\0*.*\0\0", 6);
     ofn.lpstrFilter = allFiles.charactersWithNullTermination();
     ofn.lpstrFile = fileBuf.data();
     ofn.nMaxFile = fileBuf.size();
@@ -761,7 +761,7 @@ void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChoose
         ofn.Flags = ofn.Flags | OFN_ALLOWMULTISELECT;
 
     if (GetOpenFileName(&ofn)) {
-        TCHAR* files = fileBuf.data();
+        WCHAR* files = fileBuf.data();
         Vector<String> fileList;
         String file(files);
         if (multiFile) {
@@ -769,7 +769,7 @@ void WebChromeClient::runOpenPanel(Frame*, PassRefPtr<FileChooser> prpFileChoose
                 // When using the OFN_EXPLORER flag, the file list is null delimited.
                 // When you create a String from a ptr to this list, it will use strlen to look for the null character.
                 // Then we find the next file path string by using the length of the string we just created.
-                TCHAR* nextFilePtr = files + file.length() + 1;
+                WCHAR* nextFilePtr = files + file.length() + 1;
                 String nextFile(nextFilePtr);
                 // If multiple files are selected, there will be a directory name first, which we don't want to add to the vector.
                 // We know a single file was selected if there is only one filename in the list.  
diff --git a/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp b/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp
index 9405fc8..80690c7 100644
--- a/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebContextMenuClient.cpp
@@ -41,8 +41,6 @@
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/NotImplemented.h>
 
-#include <tchar.h>
-
 using namespace WebCore;
 
 WebContextMenuClient::WebContextMenuClient(WebView* webView)
diff --git a/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp b/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp
index c232867..5abcf6b 100644
--- a/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebDragClient.cpp
@@ -31,14 +31,12 @@
 
 #include <shlobj.h>
 
-#pragma warning(push, 0) 
 #include <WebCore/ClipboardWin.h>
 #include <WebCore/DragController.h>
 #include <WebCore/DragData.h>
 #include <WebCore/FrameView.h>
 #include <WebCore/GraphicsContext.h>
 #include <WebCore/Page.h>
-#pragma warning(pop) 
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp
index 9f08087..1105904 100644
--- a/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp
@@ -33,7 +33,6 @@
 #include "WebNotificationCenter.h"
 #include "WebView.h"
 #include "DOMCoreClasses.h"
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/Document.h>
 #include <WebCore/EditCommand.h>
@@ -45,7 +44,6 @@
 #include <WebCore/PlatformKeyboardEvent.h>
 #include <WebCore/Range.h>
 #include <WebCore/UserTypingGestureIndicator.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 using namespace HTMLNames;
diff --git a/Source/WebKit/win/WebCoreSupport/WebEditorClient.h b/Source/WebKit/win/WebCoreSupport/WebEditorClient.h
index 18be400..1d0a7d0 100644
--- a/Source/WebKit/win/WebCoreSupport/WebEditorClient.h
+++ b/Source/WebKit/win/WebCoreSupport/WebEditorClient.h
@@ -27,11 +27,9 @@
 #define WebEditorClient_H
 
 #include "WebKit.h"
-#pragma warning(push, 0)
 #include <WebCore/EditorClient.h>
 #include <WebCore/TextCheckerClient.h>
 #include <wtf/OwnPtr.h>
-#pragma warning(pop)
 
 class WebView;
 class WebNotification;
diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
index 03041a6..10a3190 100644
--- a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -49,7 +49,6 @@
 #include "WebURLAuthenticationChallenge.h"
 #include "WebURLResponse.h"
 #include "WebView.h"
-#pragma warning(push, 0)
 #include <WebCore/BackForwardController.h>
 #include <WebCore/CachedFrame.h>
 #include <WebCore/DocumentLoader.h>
@@ -69,7 +68,6 @@
 #include <WebCore/RenderPart.h>
 #include <WebCore/ResourceHandle.h>
 #include <WebCore/Settings.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 using namespace HTMLNames;
diff --git a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
index 57de2ad..d864b23 100644
--- a/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
+++ b/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
@@ -29,9 +29,7 @@
 #ifndef WebFrameLoaderClient_h
 #define WebFrameLoaderClient_h
 
-#pragma warning(push, 0)
 #include <WebCore/FrameLoaderClient.h>
-#pragma warning(pop)
 
 namespace WebCore {
     class PluginManualLoader;
@@ -40,6 +38,7 @@ namespace WebCore {
 
 template <typename T> class COMPtr;
 class WebFrame;
+class WebHistory;
 
 class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
 public:
diff --git a/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp b/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
index 2922485..a93765d 100644
--- a/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp
@@ -35,7 +35,6 @@
 #include "WebNodeHighlight.h"
 #include "WebView.h"
 
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/Element.h>
 #include <WebCore/FloatRect.h>
@@ -45,9 +44,8 @@
 #include <WebCore/Page.h>
 #include <WebCore/RenderObject.h>
 #include <WebCore/WindowMessageBroadcaster.h>
-#pragma warning(pop)
 
-#include <tchar.h>
+#include <wchar.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/text/StringConcatenate.h>
 
@@ -322,6 +320,16 @@ void WebInspectorFrontendClient::inspectedURLChanged(const String& newURL)
     updateWindowTitle();
 }
 
+void WebInspectorFrontendClient::saveSessionSetting(const String& key, const String& value)
+{
+    m_inspectorClient->saveSessionSetting(key, value);
+}
+
+void WebInspectorFrontendClient::loadSessionSetting(const String& key, String* value)
+{
+    m_inspectorClient->loadSessionSetting(key, value);
+}
+
 void WebInspectorFrontendClient::closeWindowWithoutNotifications()
 {
     if (!m_frontendHwnd)
diff --git a/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h b/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h
index a059559..e5ddbd5 100644
--- a/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h
+++ b/Source/WebKit/win/WebCoreSupport/WebInspectorClient.h
@@ -35,7 +35,9 @@
 #include <WebCore/PlatformString.h>
 #include <WebCore/WindowMessageListener.h>
 #include <wtf/Forward.h>
+#include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/text/StringHash.h>
 #include <windows.h>
 
 namespace WebCore {
@@ -73,6 +75,9 @@ public:
         releaseFrontendPage();
     }
 
+    void saveSessionSetting(const WTF::String& key, const WTF::String& value);
+    void loadSessionSetting(const WTF::String& key, WTF::String* value);
+
 private:
     ~WebInspectorClient();
     WTF::PassOwnPtr<WebCore::InspectorFrontendClientLocal::Settings> createFrontendSettings();
@@ -83,6 +88,8 @@ private:
     HWND m_frontendHwnd;
 
     OwnPtr<WebNodeHighlight> m_highlight;
+
+    WTF::HashMap<WTF::String, WTF::String> m_sessionSettings;
 };
 
 class WebInspectorFrontendClient : public WebCore::InspectorFrontendClientLocal, WebCore::WindowMessageListener {
@@ -104,6 +111,9 @@ public:
     virtual void setAttachedWindowHeight(unsigned height);
     virtual void inspectedURLChanged(const WTF::String& newURL);
 
+    virtual void saveSessionSetting(const WTF::String& key, const WTF::String& value);
+    virtual void loadSessionSetting(const WTF::String& key, WTF::String* value);
+
 private:
     ~WebInspectorFrontendClient();
 
diff --git a/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.h b/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.h
index 7561d5a..dce935a 100644
--- a/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.h
+++ b/Source/WebKit/win/WebCoreSupport/WebInspectorDelegate.h
@@ -1,336 +1,330 @@
-/*

- * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>

- *

- * 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. 

- * 3.  Neither the name of Apple Computer, 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. 

- *

- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.

- */

-

-#ifndef WebInspectorDelegate_h

-#define WebInspectorDelegate_h

-

-struct IDataObject;

-struct IPropertyBag;

-struct IWebView;

-struct IWebFrame;

-struct IWebError;

-struct IWebURLRequest;

-struct IWebOpenPanelResultListener;

-

-class WebInspectorDelegate : public IWebUIDelegate {

-public:

-    static WebInspectorDelegate* createInstance();

-

-    // IUnknown

-    virtual ULONG STDMETHODCALLTYPE AddRef();

-    virtual ULONG STDMETHODCALLTYPE Release();

-    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**) { return E_NOTIMPL; };

-

-    // IWebUIDelegate

-    virtual HRESULT STDMETHODCALLTYPE dragDestinationActionMaskForDraggingInfo( 

-        /* [in] */ IWebView*,

-        /* [in] */ IDataObject*,

-        /* [retval][out] */ WebDragDestinationAction* action);

-

-    // Not implemented

-    virtual HRESULT STDMETHODCALLTYPE createWebViewWithRequest( 

-        /* [in] */ IWebView*,

-        /* [in] */ IWebURLRequest*,

-        /* [retval][out] */ IWebView**) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewShow( 

-        /* [in] */ IWebView*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewClose( 

-        /* [in] */ IWebView*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewFocus( 

-        /* [in] */ IWebView*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewUnfocus( 

-        /* [in] */ IWebView*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder( 

-        /* [in] */ IWebView*,

-        /* [retval][out] */ OLE_HANDLE*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE makeFirstResponder( 

-        /* [in] */ IWebView*,

-        /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE setStatusText( 

-        /* [in] */ IWebView*,

-        /* [in] */ BSTR) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewStatusText( 

-        /* [in] */ IWebView*,

-        /* [retval][out] */ BSTR*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewAreToolbarsVisible( 

-        /* [in] */ IWebView*,

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE setToolbarsVisible( 

-        /* [in] */ IWebView*,

-        /* [in] */ BOOL) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewIsStatusBarVisible( 

-        /* [in] */ IWebView*,

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE setStatusBarVisible( 

-        /* [in] */ IWebView*,

-        /* [in] */ BOOL) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewIsResizable( 

-        /* [in] */ IWebView*,

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE setResizable( 

-        /* [in] */ IWebView*,

-        /* [in] */ BOOL) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE setFrame( 

-        /* [in] */ IWebView*,

-        /* [in] */ RECT*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewFrame( 

-        /* [in] */ IWebView*,

-        /* [retval][out] */ RECT*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE setContentRect( 

-        /* [in] */ IWebView*,

-        /* [in] */ RECT*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE webViewContentRect( 

-        /* [in] */ IWebView*,

-        /* [retval][out] */ RECT*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE runJavaScriptAlertPanelWithMessage( 

-        /* [in] */ IWebView*,

-        /* [in] */ BSTR) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE runJavaScriptConfirmPanelWithMessage( 

-        /* [in] */ IWebView*,

-        /* [in] */ BSTR,

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE runJavaScriptTextInputPanelWithPrompt( 

-        /* [in] */ IWebView*,

-        /* [in] */ BSTR /*message*/,

-        /* [in] */ BSTR /*defaultText*/,

-        /* [retval][out] */ BSTR*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE runBeforeUnloadConfirmPanelWithMessage( 

-        /* [in] */ IWebView*,

-        /* [in] */ BSTR /*message*/,

-        /* [in] */ IWebFrame*  /*initiatedByFrame*/,

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE runOpenPanelForFileButtonWithResultListener( 

-        /* [in] */ IWebView*,

-        /* [in] */ IWebOpenPanelResultListener*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE mouseDidMoveOverElement( 

-        /* [in] */ IWebView*,

-        /* [in] */ IPropertyBag*,

-        /* [in] */ UINT /*modifierFlags*/) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE contextMenuItemsForElement( 

-        /* [in] */ IWebView*,

-        /* [in] */ IPropertyBag*,

-        /* [in] */ OLE_HANDLE,

-        /* [retval][out] */ OLE_HANDLE*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE validateUserInterfaceItem( 

-        /* [in] */ IWebView*,

-        /* [in] */ UINT,

-        /* [in] */ BOOL,

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE shouldPerformAction( 

-        /* [in] */ IWebView*,

-        /* [in] */ UINT /*itemCommandID*/,

-        /* [in] */ UINT /*sender*/) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE willPerformDragDestinationAction( 

-        /* [in] */ IWebView*,

-        /* [in] */ WebDragDestinationAction,

-        /* [in] */ IDataObject*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE dragSourceActionMaskForPoint( 

-        /* [in] */ IWebView*,

-        /* [in] */ LPPOINT,

-        /* [retval][out] */ WebDragSourceAction*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE willPerformDragSourceAction( 

-        /* [in] */ IWebView*,

-        /* [in] */ WebDragSourceAction,

-        /* [in] */ LPPOINT,

-        /* [in] */ IDataObject*,

-        /* [retval][out] */ IDataObject**) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE contextMenuItemSelected( 

-        /* [in] */ IWebView*,

-        /* [in] */ void*  /*item*/,

-        /* [in] */ IPropertyBag*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE hasCustomMenuImplementation( 

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE trackCustomPopupMenu( 

-        /* [in] */ IWebView*,

-        /* [in] */ OLE_HANDLE,

-        /* [in] */ LPPOINT) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE measureCustomMenuItem( 

-        /* [in] */ IWebView*,

-        /* [in] */ void*  /*measureItem*/) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE drawCustomMenuItem( 

-        /* [in] */ IWebView*,

-        /* [in] */ void*  /*drawItem*/) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE addCustomMenuDrawingData( 

-        /* [in] */ IWebView*,

-        /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE cleanUpCustomMenuDrawingData( 

-        /* [in] */ IWebView*,

-        /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE canTakeFocus( 

-        /* [in] */ IWebView*,

-        /* [in] */ BOOL /*forward*/,

-        /* [out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE takeFocus( 

-        /* [in] */ IWebView*,

-        /* [in] */ BOOL /*forward*/) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE registerUndoWithTarget( 

-        /* [in] */ IWebUndoTarget*,

-        /* [in] */ BSTR /*actionName*/,

-        /* [in] */ IUnknown*  /*actionArg*/) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE removeAllActionsWithTarget( 

-        /* [in] */ IWebUndoTarget*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE setActionTitle( 

-        /* [in] */ BSTR) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE undo() { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE redo() { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE canUndo( 

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE canRedo( 

-        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE printFrame( 

-        /* [in] */ IWebView *webView,

-        /* [in] */ IWebFrame *frame) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE ftpDirectoryTemplatePath( 

-        /* [in] */ IWebView *webView,

-        /* [retval][out] */ BSTR *path) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE webViewHeaderHeight( 

-        /* [in] */ IWebView *webView,

-        /* [retval][out] */ float *result) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE webViewFooterHeight( 

-        /* [in] */ IWebView *webView,

-        /* [retval][out] */ float *result) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect( 

-        /* [in] */ IWebView *webView,

-        /* [in] */ RECT *rect,

-        /* [in] */ OLE_HANDLE drawingContext) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE drawFooterInRect( 

-        /* [in] */ IWebView *webView,

-        /* [in] */ RECT *rect,

-        /* [in] */ OLE_HANDLE drawingContext,

-        /* [in] */ UINT pageIndex,

-        /* [in] */ UINT pageCount) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE webViewPrintingMarginRect( 

-        /* [in] */ IWebView *webView,

-        /* [retval][out] */ RECT *rect) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE canRunModal( 

-        /* [in] */ IWebView *webView,

-        /* [retval][out] */ BOOL *canRunBoolean) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE createModalDialog( 

-        /* [in] */ IWebView *sender,

-        /* [in] */ IWebURLRequest *request,

-        /* [retval][out] */ IWebView **newWebView) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE runModal( 

-        /* [in] */ IWebView *webView) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE isMenuBarVisible( 

-        /* [in] */ IWebView *webView,

-        /* [retval][out] */ BOOL *visible) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE setMenuBarVisible( 

-        /* [in] */ IWebView *webView,

-        /* [in] */ BOOL visible) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE runDatabaseSizeLimitPrompt( 

-        /* [in] */ IWebView *webView,

-        /* [in] */ BSTR displayName,

-        /* [in] */ IWebFrame *initiatedByFrame,

-        /* [retval][out] */ BOOL *allowed) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE paintCustomScrollbar( 

-        /* [in] */ IWebView *webView,

-        /* [in] */ HDC hDC,

-        /* [in] */ RECT rect,

-        /* [in] */ WebScrollBarControlSize size,

-        /* [in] */ WebScrollbarControlState state,

-        /* [in] */ WebScrollbarControlPart pressedPart,

-        /* [in] */ BOOL vertical,

-        /* [in] */ float value,

-        /* [in] */ float proportion,

-        /* [in] */ WebScrollbarControlPartMask parts) { return E_NOTIMPL; }

-    

-    virtual HRESULT STDMETHODCALLTYPE paintCustomScrollCorner( 

-        /* [in] */ IWebView *webView,

-        /* [in] */ HDC hDC,

-        /* [in] */ RECT rect) { return E_NOTIMPL; }

-

-    virtual HRESULT STDMETHODCALLTYPE desktopNotificationsDelegate(

-        /* [retval][out] */ IWebDesktopNotificationsDelegate **result) { return E_NOTIMPL; }

-

-private:

-    WebInspectorDelegate();

-

-    ULONG m_refCount;

-};

-

-#endif // WebInspectorDelegate_h

+/*
+ * Copyright (C) 2008 Matt Lilek <webkit@mattlilek.com>
+ *
+ * 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. 
+ * 3.  Neither the name of Apple Computer, 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. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "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 OR ITS 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.
+ */
+
+#ifndef WebInspectorDelegate_h
+#define WebInspectorDelegate_h
+
+#include "WebKit.h"
+
+class WebInspectorDelegate : public IWebUIDelegate {
+public:
+    static WebInspectorDelegate* createInstance();
+
+    // IUnknown
+    virtual ULONG STDMETHODCALLTYPE AddRef();
+    virtual ULONG STDMETHODCALLTYPE Release();
+    virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**) { return E_NOTIMPL; };
+
+    // IWebUIDelegate
+    virtual HRESULT STDMETHODCALLTYPE dragDestinationActionMaskForDraggingInfo( 
+        /* [in] */ IWebView*,
+        /* [in] */ IDataObject*,
+        /* [retval][out] */ WebDragDestinationAction* action);
+
+    // Not implemented
+    virtual HRESULT STDMETHODCALLTYPE createWebViewWithRequest( 
+        /* [in] */ IWebView*,
+        /* [in] */ IWebURLRequest*,
+        /* [retval][out] */ IWebView**) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewShow( 
+        /* [in] */ IWebView*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewClose( 
+        /* [in] */ IWebView*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewFocus( 
+        /* [in] */ IWebView*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewUnfocus( 
+        /* [in] */ IWebView*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewFirstResponder( 
+        /* [in] */ IWebView*,
+        /* [retval][out] */ OLE_HANDLE*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE makeFirstResponder( 
+        /* [in] */ IWebView*,
+        /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE setStatusText( 
+        /* [in] */ IWebView*,
+        /* [in] */ BSTR) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewStatusText( 
+        /* [in] */ IWebView*,
+        /* [retval][out] */ BSTR*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewAreToolbarsVisible( 
+        /* [in] */ IWebView*,
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE setToolbarsVisible( 
+        /* [in] */ IWebView*,
+        /* [in] */ BOOL) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewIsStatusBarVisible( 
+        /* [in] */ IWebView*,
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE setStatusBarVisible( 
+        /* [in] */ IWebView*,
+        /* [in] */ BOOL) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewIsResizable( 
+        /* [in] */ IWebView*,
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE setResizable( 
+        /* [in] */ IWebView*,
+        /* [in] */ BOOL) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE setFrame( 
+        /* [in] */ IWebView*,
+        /* [in] */ RECT*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewFrame( 
+        /* [in] */ IWebView*,
+        /* [retval][out] */ RECT*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE setContentRect( 
+        /* [in] */ IWebView*,
+        /* [in] */ RECT*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE webViewContentRect( 
+        /* [in] */ IWebView*,
+        /* [retval][out] */ RECT*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE runJavaScriptAlertPanelWithMessage( 
+        /* [in] */ IWebView*,
+        /* [in] */ BSTR) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE runJavaScriptConfirmPanelWithMessage( 
+        /* [in] */ IWebView*,
+        /* [in] */ BSTR,
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE runJavaScriptTextInputPanelWithPrompt( 
+        /* [in] */ IWebView*,
+        /* [in] */ BSTR /*message*/,
+        /* [in] */ BSTR /*defaultText*/,
+        /* [retval][out] */ BSTR*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE runBeforeUnloadConfirmPanelWithMessage( 
+        /* [in] */ IWebView*,
+        /* [in] */ BSTR /*message*/,
+        /* [in] */ IWebFrame*  /*initiatedByFrame*/,
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE runOpenPanelForFileButtonWithResultListener( 
+        /* [in] */ IWebView*,
+        /* [in] */ IWebOpenPanelResultListener*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE mouseDidMoveOverElement( 
+        /* [in] */ IWebView*,
+        /* [in] */ IPropertyBag*,
+        /* [in] */ UINT /*modifierFlags*/) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE contextMenuItemsForElement( 
+        /* [in] */ IWebView*,
+        /* [in] */ IPropertyBag*,
+        /* [in] */ OLE_HANDLE,
+        /* [retval][out] */ OLE_HANDLE*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE validateUserInterfaceItem( 
+        /* [in] */ IWebView*,
+        /* [in] */ UINT,
+        /* [in] */ BOOL,
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE shouldPerformAction( 
+        /* [in] */ IWebView*,
+        /* [in] */ UINT /*itemCommandID*/,
+        /* [in] */ UINT /*sender*/) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE willPerformDragDestinationAction( 
+        /* [in] */ IWebView*,
+        /* [in] */ WebDragDestinationAction,
+        /* [in] */ IDataObject*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE dragSourceActionMaskForPoint( 
+        /* [in] */ IWebView*,
+        /* [in] */ LPPOINT,
+        /* [retval][out] */ WebDragSourceAction*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE willPerformDragSourceAction( 
+        /* [in] */ IWebView*,
+        /* [in] */ WebDragSourceAction,
+        /* [in] */ LPPOINT,
+        /* [in] */ IDataObject*,
+        /* [retval][out] */ IDataObject**) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE contextMenuItemSelected( 
+        /* [in] */ IWebView*,
+        /* [in] */ void*  /*item*/,
+        /* [in] */ IPropertyBag*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE hasCustomMenuImplementation( 
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE trackCustomPopupMenu( 
+        /* [in] */ IWebView*,
+        /* [in] */ OLE_HANDLE,
+        /* [in] */ LPPOINT) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE measureCustomMenuItem( 
+        /* [in] */ IWebView*,
+        /* [in] */ void*  /*measureItem*/) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE drawCustomMenuItem( 
+        /* [in] */ IWebView*,
+        /* [in] */ void*  /*drawItem*/) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE addCustomMenuDrawingData( 
+        /* [in] */ IWebView*,
+        /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE cleanUpCustomMenuDrawingData( 
+        /* [in] */ IWebView*,
+        /* [in] */ OLE_HANDLE) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE canTakeFocus( 
+        /* [in] */ IWebView*,
+        /* [in] */ BOOL /*forward*/,
+        /* [out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE takeFocus( 
+        /* [in] */ IWebView*,
+        /* [in] */ BOOL /*forward*/) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE registerUndoWithTarget( 
+        /* [in] */ IWebUndoTarget*,
+        /* [in] */ BSTR /*actionName*/,
+        /* [in] */ IUnknown*  /*actionArg*/) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE removeAllActionsWithTarget( 
+        /* [in] */ IWebUndoTarget*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE setActionTitle( 
+        /* [in] */ BSTR) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE undo() { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE redo() { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE canUndo( 
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE canRedo( 
+        /* [retval][out] */ BOOL*) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE printFrame( 
+        /* [in] */ IWebView *webView,
+        /* [in] */ IWebFrame *frame) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE ftpDirectoryTemplatePath( 
+        /* [in] */ IWebView *webView,
+        /* [retval][out] */ BSTR *path) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE webViewHeaderHeight( 
+        /* [in] */ IWebView *webView,
+        /* [retval][out] */ float *result) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE webViewFooterHeight( 
+        /* [in] */ IWebView *webView,
+        /* [retval][out] */ float *result) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE drawHeaderInRect( 
+        /* [in] */ IWebView *webView,
+        /* [in] */ RECT *rect,
+        /* [in] */ OLE_HANDLE drawingContext) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE drawFooterInRect( 
+        /* [in] */ IWebView *webView,
+        /* [in] */ RECT *rect,
+        /* [in] */ OLE_HANDLE drawingContext,
+        /* [in] */ UINT pageIndex,
+        /* [in] */ UINT pageCount) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE webViewPrintingMarginRect( 
+        /* [in] */ IWebView *webView,
+        /* [retval][out] */ RECT *rect) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE canRunModal( 
+        /* [in] */ IWebView *webView,
+        /* [retval][out] */ BOOL *canRunBoolean) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE createModalDialog( 
+        /* [in] */ IWebView *sender,
+        /* [in] */ IWebURLRequest *request,
+        /* [retval][out] */ IWebView **newWebView) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE runModal( 
+        /* [in] */ IWebView *webView) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE isMenuBarVisible( 
+        /* [in] */ IWebView *webView,
+        /* [retval][out] */ BOOL *visible) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE setMenuBarVisible( 
+        /* [in] */ IWebView *webView,
+        /* [in] */ BOOL visible) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE runDatabaseSizeLimitPrompt( 
+        /* [in] */ IWebView *webView,
+        /* [in] */ BSTR displayName,
+        /* [in] */ IWebFrame *initiatedByFrame,
+        /* [retval][out] */ BOOL *allowed) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE paintCustomScrollbar( 
+        /* [in] */ IWebView *webView,
+        /* [in] */ HDC hDC,
+        /* [in] */ RECT rect,
+        /* [in] */ WebScrollBarControlSize size,
+        /* [in] */ WebScrollbarControlState state,
+        /* [in] */ WebScrollbarControlPart pressedPart,
+        /* [in] */ BOOL vertical,
+        /* [in] */ float value,
+        /* [in] */ float proportion,
+        /* [in] */ WebScrollbarControlPartMask parts) { return E_NOTIMPL; }
+    
+    virtual HRESULT STDMETHODCALLTYPE paintCustomScrollCorner( 
+        /* [in] */ IWebView *webView,
+        /* [in] */ HDC hDC,
+        /* [in] */ RECT rect) { return E_NOTIMPL; }
+
+    virtual HRESULT STDMETHODCALLTYPE desktopNotificationsDelegate(
+        /* [retval][out] */ IWebDesktopNotificationsDelegate **result) { return E_NOTIMPL; }
+
+private:
+    WebInspectorDelegate();
+
+    ULONG m_refCount;
+};
+
+#endif // WebInspectorDelegate_h
diff --git a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
index 9f5b20e..e87777e 100644
--- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
+++ b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.cpp
@@ -285,7 +285,7 @@ String WebPlatformStrategies::contextMenuItemTagSearchWeb()
     return UI_STRING("Search with Google", "Search in Google context menu item");
 }
 
-String WebPlatformStrategies::contextMenuItemTagLookUpInDictionary()
+String WebPlatformStrategies::contextMenuItemTagLookUpInDictionary(const String&)
 {
     return UI_STRING("Look Up in Dictionary", "Look Up in Dictionary context menu item");
 }
diff --git a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h
index 4e5bb18..6d2949d 100644
--- a/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h
+++ b/Source/WebKit/win/WebCoreSupport/WebPlatformStrategies.h
@@ -79,7 +79,7 @@ private:
     virtual WTF::String contextMenuItemTagIgnoreSpelling();
     virtual WTF::String contextMenuItemTagLearnSpelling();
     virtual WTF::String contextMenuItemTagSearchWeb();
-    virtual WTF::String contextMenuItemTagLookUpInDictionary();
+    virtual WTF::String contextMenuItemTagLookUpInDictionary(const WTF::String&);
     virtual WTF::String contextMenuItemTagOpenLink();
     virtual WTF::String contextMenuItemTagIgnoreGrammar();
     virtual WTF::String contextMenuItemTagSpellingMenu();
diff --git a/Source/WebKit/win/WebDataSource.h b/Source/WebKit/win/WebDataSource.h
index 3baa024..992e9dd 100644
--- a/Source/WebKit/win/WebDataSource.h
+++ b/Source/WebKit/win/WebDataSource.h
@@ -27,8 +27,8 @@
 #define WebDataSource_H
 
 #include "WebKit.h"
-#include "COMPtr.h"
-#include <WTF/RefPtr.h>
+#include <WebCore/COMPtr.h>
+#include <wtf/RefPtr.h>
 
 class WebDocumentLoader;
 class WebMutableURLRequest;
diff --git a/Source/WebKit/win/WebDatabaseManager.h b/Source/WebKit/win/WebDatabaseManager.h
index a8ca523..b52cbd5 100644
--- a/Source/WebKit/win/WebDatabaseManager.h
+++ b/Source/WebKit/win/WebDatabaseManager.h
@@ -31,9 +31,8 @@
 
 #if ENABLE(DATABASE)
 
-#include <WebCore/DatabaseTrackerClient.h>
-
 #include "WebKit.h"
+#include <WebCore/DatabaseTrackerClient.h>
 
 class WebDatabaseManager : public IWebDatabaseManager, private WebCore::DatabaseTrackerClient {
 public:
diff --git a/Source/WebKit/win/WebDocumentLoader.h b/Source/WebKit/win/WebDocumentLoader.h
index ad0544e..93b2a86 100644
--- a/Source/WebKit/win/WebDocumentLoader.h
+++ b/Source/WebKit/win/WebDocumentLoader.h
@@ -24,10 +24,7 @@
  */
 
 #include "WebDataSource.h"
-
-#pragma warning(push, 0)
 #include <WebCore/DocumentLoader.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebDownload.cpp b/Source/WebKit/win/WebDownload.cpp
index 45e36cc..cb5e2c3 100644
--- a/Source/WebKit/win/WebDownload.cpp
+++ b/Source/WebKit/win/WebDownload.cpp
@@ -38,7 +38,6 @@
 #include "WebURLResponse.h"
 #include <wtf/text/CString.h>
 
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/DownloadBundle.h>
 #include <WebCore/NotImplemented.h>
@@ -48,7 +47,6 @@
 #include <WebCore/ResourceResponse.h>
 #include <wtf/CurrentTime.h>
 #include <wtf/StdLibExtras.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebDownloadCFNet.cpp b/Source/WebKit/win/WebDownloadCFNet.cpp
index 5a1f1bc..7398a2a 100644
--- a/Source/WebKit/win/WebDownloadCFNet.cpp
+++ b/Source/WebKit/win/WebDownloadCFNet.cpp
@@ -44,7 +44,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#pragma warning(push, 0)
 #include <WebCore/AuthenticationCF.h>
 #include <WebCore/BString.h>
 #include <WebCore/CredentialStorage.h>
@@ -55,7 +54,6 @@
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
 #include <wtf/CurrentTime.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebDownloadCurl.cpp b/Source/WebKit/win/WebDownloadCurl.cpp
index 2025922..5eab2bb 100644
--- a/Source/WebKit/win/WebDownloadCurl.cpp
+++ b/Source/WebKit/win/WebDownloadCurl.cpp
@@ -44,7 +44,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/ResourceError.h>
@@ -52,7 +51,6 @@
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
 #include <WebCore/SystemTime.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebElementPropertyBag.cpp b/Source/WebKit/win/WebElementPropertyBag.cpp
index e68360c..4ca0a71 100644
--- a/Source/WebKit/win/WebElementPropertyBag.cpp
+++ b/Source/WebKit/win/WebElementPropertyBag.cpp
@@ -30,7 +30,6 @@
 #include "MarshallingHelpers.h"
 #include "DOMCoreClasses.h"
 #include "WebFrame.h"
-#pragma warning(push, 0)
 #include <WebCore/Document.h>
 #include <WebCore/Frame.h>
 #include <WebCore/HitTestResult.h>
@@ -38,7 +37,6 @@
 #include <WebCore/Image.h>
 #include <WebCore/KURL.h>
 #include <WebCore/RenderObject.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebElementPropertyBag.h b/Source/WebKit/win/WebElementPropertyBag.h
index 3d96a65..7c2a565 100644
--- a/Source/WebKit/win/WebElementPropertyBag.h
+++ b/Source/WebKit/win/WebElementPropertyBag.h
@@ -26,9 +26,8 @@
 #ifndef WebElementPropertyBag_H
 #define WebElementPropertyBag_H
 
-#include "ocidl.h"
-
-#include <WTF/OwnPtr.h>
+#include <ocidl.h>
+#include <wtf/OwnPtr.h>
 
 namespace WebCore {
     class HitTestResult;
diff --git a/Source/WebKit/win/WebError.cpp b/Source/WebKit/win/WebError.cpp
index c9f1dff..16006ff 100644
--- a/Source/WebKit/win/WebError.cpp
+++ b/Source/WebKit/win/WebError.cpp
@@ -28,9 +28,7 @@
 #include "WebError.h"
 #include "WebKit.h"
 
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
-#pragma warning(pop)
 
 #if USE(CFNETWORK)
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
@@ -227,7 +225,7 @@ HRESULT STDMETHODCALLTYPE WebError::sslPeerCertificate(
     if (!m_cfErrorUserInfoDict)
         return E_FAIL;
 
-    void* data = wkGetSSLPeerCertificateData(m_cfErrorUserInfoDict.get());
+    void* data = wkGetSSLPeerCertificateDataBytePtr(m_cfErrorUserInfoDict.get());
     if (!data)
         return E_FAIL;
     *result = (OLE_HANDLE)(ULONG64)data;
diff --git a/Source/WebKit/win/WebError.h b/Source/WebKit/win/WebError.h
index ff0625d..0e78cf2 100644
--- a/Source/WebKit/win/WebError.h
+++ b/Source/WebKit/win/WebError.h
@@ -27,12 +27,8 @@
 #define WebError_h
 
 #include "WebKit.h"
-
-#pragma warning(push, 0)
 #include <WebCore/COMPtr.h>
 #include <WebCore/ResourceError.h>
-#pragma warning(pop)
-
 #include <wtf/RetainPtr.h>
 
 class WebError : public IWebError, IWebErrorPrivate {
diff --git a/Source/WebKit/win/WebFrame.cpp b/Source/WebKit/win/WebFrame.cpp
index e412543..4b9e35d 100644
--- a/Source/WebKit/win/WebFrame.cpp
+++ b/Source/WebKit/win/WebFrame.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,6 @@
 #include "WebScriptWorld.h"
 #include "WebURLResponse.h"
 #include "WebView.h"
-#pragma warning( push, 0 )
 #include <WebCore/BString.h>
 #include <WebCore/MemoryCache.h>
 #include <WebCore/Document.h>
@@ -104,11 +103,11 @@
 #include <JavaScriptCore/JSObject.h>
 #include <JavaScriptCore/JSValue.h>
 #include <wtf/MathExtras.h>
-#pragma warning(pop)
 
 #if PLATFORM(CG)
 #include <CoreGraphics/CoreGraphics.h>
 #elif PLATFORM(CAIRO)
+#include "PlatformContextCairo.h"
 #include <cairo-win32.h>
 #endif
 
@@ -1029,7 +1028,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::hasSpellingMarker(
     Frame* coreFrame = core(this);
     if (!coreFrame)
         return E_FAIL;
-    *result = coreFrame->editor()->selectionStartHasSpellingMarkerFor(from, length);
+    *result = coreFrame->editor()->selectionStartHasMarkerFor(DocumentMarker::Spelling, from, length);
     return S_OK;
 }
 
@@ -1899,9 +1898,9 @@ PassRefPtr<Widget> WebFrame::createJavaAppletWidget(const IntSize& pluginSize, H
     return pluginView;
 }
 
-ObjectContentType WebFrame::objectContentType(const KURL& url, const String& mimeType)
+ObjectContentType WebFrame::objectContentType(const KURL& url, const String& mimeType, bool shouldPreferPlugInsForImages)
 {
-    return WebCore::FrameLoader::defaultObjectContentType(url, mimeType);
+    return WebCore::FrameLoader::defaultObjectContentType(url, mimeType, shouldPreferPlugInsForImages);
 }
 
 String WebFrame::overrideMediaType() const
@@ -2188,8 +2187,7 @@ static float scaleFactor(HDC printDC, const IntRect& marginRect, const IntRect&
 
 static HDC hdcFromContext(PlatformGraphicsContext* pctx)
 {
-    cairo_surface_t* surface = cairo_get_target(pctx);
-    return cairo_win32_surface_get_dc(surface);
+    return cairo_win32_surface_get_dc(cairo_get_target(pctx->cr()));
 }
 
 void WebFrame::drawHeader(PlatformGraphicsContext* pctx, IWebUIDelegate* ui, const IntRect& pageRect, float headerHeight)
@@ -2244,13 +2242,14 @@ void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCt
     XFORM original, scaled;
     GetWorldTransform(hdc, &original);
     
+    cairo_t* cr = pctx->cr();
     bool preview = (hdc != printDC);
     if (preview) {
         // If this is a preview, the Windows HDC was set to a non-scaled state so that Cairo will
         // draw correctly.  We need to retain the correct preview scale here for use when the Cairo
         // drawing completes so that we can scale our GDI-based header/footer calls. This is a
         // workaround for a bug in Cairo (see https://bugs.freedesktop.org/show_bug.cgi?id=28161)
-        scaled = buildXFORMFromCairo(hdc, pctx);
+        scaled = buildXFORMFromCairo(hdc, cr);
     }
 
     float scale = scaleFactor(printDC, marginRect, pageRect);
@@ -2260,13 +2259,13 @@ void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCt
 
     // We cannot scale the display HDC because the print surface also scales fonts,
     // resulting in invalid printing (and print preview)
-    cairo_scale(pctx, scale, scale);
-    cairo_translate(pctx, cairoMarginRect.x(), cairoMarginRect.y() + headerHeight);
+    cairo_scale(cr, scale, scale);
+    cairo_translate(cr, cairoMarginRect.x(), cairoMarginRect.y() + headerHeight);
 
     // Modify Cairo (only) to account for page position.
-    cairo_translate(pctx, -pageRect.x(), -pageRect.y());
+    cairo_translate(cr, -pageRect.x(), -pageRect.y());
     coreFrame->view()->paintContents(spoolCtx, pageRect);
-    cairo_translate(pctx, pageRect.x(), pageRect.y());
+    cairo_translate(cr, pageRect.x(), pageRect.y());
     
     if (preview) {
         // If this is a preview, the Windows HDC was set to a non-scaled state so that Cairo would
@@ -2287,8 +2286,8 @@ void WebFrame::spoolPage(PlatformGraphicsContext* pctx, GraphicsContext* spoolCt
 
     SetWorldTransform(hdc, &original);
 
-    cairo_show_page(pctx);
-    ASSERT(!cairo_status(pctx));
+    cairo_show_page(cr);
+    ASSERT(!cairo_status(cr));
     spoolCtx->restore();
 }
 
@@ -2340,17 +2339,21 @@ HRESULT STDMETHODCALLTYPE WebFrame::spoolPages(
     else
         printSurface = cairo_win32_printing_surface_create(targetDC); // metafile
     
-    PlatformGraphicsContext* pctx = (PlatformGraphicsContext*)cairo_create(printSurface);
-    if (!pctx) {
+    cairo_t* cr = cairo_create(printSurface);
+    if (!cr) {
         cairo_surface_destroy(printSurface);    
         return E_FAIL;
     }
-    
+
+    PlatformContextCairo platformContext(cr);
+    PlatformGraphicsContext* pctx = &platformContext;
+    cairo_destroy(cr);
+
     if (ctx) {
         // If this is a preview, the Windows HDC was sent with scaling information.
         // Retrieve it and reset it so that it draws properly.  This is a workaround
         // for a bug in Cairo (see https://bugs.freedesktop.org/show_bug.cgi?id=28161)
-        setCairoTransformToPreviewHDC(pctx, targetDC);
+        setCairoTransformToPreviewHDC(cr, targetDC);
     }
     
     cairo_surface_set_fallback_resolution(printSurface, 72.0, 72.0);
@@ -2394,7 +2397,6 @@ HRESULT STDMETHODCALLTYPE WebFrame::spoolPages(
         spoolPage(pctx, &spoolCtx, printDC, ui.get(), headerHeight, footerHeight, ii, pageCount);
 
 #if PLATFORM(CAIRO)
-    cairo_destroy(pctx);
     cairo_surface_finish(printSurface);
     ASSERT(!cairo_surface_status(printSurface));
     cairo_surface_destroy(printSurface);
diff --git a/Source/WebKit/win/WebFrame.h b/Source/WebKit/win/WebFrame.h
index 59c0aec..9158fb3 100644
--- a/Source/WebKit/win/WebFrame.h
+++ b/Source/WebKit/win/WebFrame.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007 Apple Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,13 +33,11 @@
 
 #include "AccessibleDocument.h"
 
-#pragma warning(push, 0)
 #include <WebCore/FrameWin.h>
 #include <WebCore/GraphicsContext.h>
 #include <WebCore/KURL.h>
 #include <WebCore/PlatformString.h>
 #include <WebCore/ResourceHandleClient.h>
-#pragma warning(pop)
 
 #include <WTF/RefPtr.h>
 #include <WTF/HashMap.h>
@@ -64,7 +62,10 @@ typedef struct OpaqueJSValue* JSObjectRef;
 #if PLATFORM(CG)
 typedef struct CGContext PlatformGraphicsContext;
 #elif PLATFORM(CAIRO)
-typedef struct _cairo PlatformGraphicsContext;
+namespace WebCore {
+class PlatformContextCairo;
+}
+typedef class WebCore::PlatformContextCairo PlatformGraphicsContext;
 #endif
 
 class WebFrame;
@@ -341,7 +342,7 @@ public:
         
     virtual PassRefPtr<WebCore::Widget> createJavaAppletWidget(const WebCore::IntSize&, WebCore::HTMLAppletElement*, const WebCore::KURL& baseURL, const Vector<WTF::String>& paramNames, const Vector<WTF::String>& paramValues);
 
-    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL& url, const WTF::String& mimeType);
+    virtual WebCore::ObjectContentType objectContentType(const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlugInsForImages);
     virtual WTF::String overrideMediaType() const;
 
     virtual void dispatchDidClearWindowObjectInWorld(WebCore::DOMWrapperWorld*);
diff --git a/Source/WebKit/win/WebFramePolicyListener.cpp b/Source/WebKit/win/WebFramePolicyListener.cpp
index e82043d..4d19e1a 100644
--- a/Source/WebKit/win/WebFramePolicyListener.cpp
+++ b/Source/WebKit/win/WebFramePolicyListener.cpp
@@ -28,12 +28,9 @@
 #include "WebFramePolicyListener.h"
 
 #include "WebFrame.h"
-
-#pragma warning(push, 0)
 #include <WebCore/Frame.h>
 #include <WebCore/FrameLoader.h>
 #include <WebCore/FrameLoaderClient.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebFramePolicyListener.h b/Source/WebKit/win/WebFramePolicyListener.h
index 42f6d94..f1663e7 100644
--- a/Source/WebKit/win/WebFramePolicyListener.h
+++ b/Source/WebKit/win/WebFramePolicyListener.h
@@ -27,13 +27,10 @@
 #define WebFramePolicyListener_h
 
 #include "WebKit.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
 
-#include <WTF/PassRefPtr.h>
-#include <WTF/RefPtr.h>
-
-#pragma warning(push, 0)
 #include <WebCore/FrameLoaderTypes.h>
-#pragma warning(pop)
 
 namespace WebCore {
     class Frame;
diff --git a/Source/WebKit/win/WebGeolocationPolicyListener.h b/Source/WebKit/win/WebGeolocationPolicyListener.h
index 636c5f5..17d3d58 100644
--- a/Source/WebKit/win/WebGeolocationPolicyListener.h
+++ b/Source/WebKit/win/WebGeolocationPolicyListener.h
@@ -27,11 +27,9 @@
 #define WebGeolocationPolicyListener_h
 
 #include "WebKit.h"
-
 #include <WebCore/COMPtr.h>
-
-#include <WTF/PassRefPtr.h>
-#include <WTF/RefPtr.h>
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebCore {
     class Geolocation;
diff --git a/Source/WebKit/win/WebHistory.cpp b/Source/WebKit/win/WebHistory.cpp
index 4caa554..efd6494 100644
--- a/Source/WebKit/win/WebHistory.cpp
+++ b/Source/WebKit/win/WebHistory.cpp
@@ -36,13 +36,11 @@
 #include "WebNotificationCenter.h"
 #include "WebPreferences.h"
 #include <CoreFoundation/CoreFoundation.h>
-#pragma warning( push, 0 )
 #include <WebCore/HistoryItem.h>
 #include <WebCore/HistoryPropertyList.h>
 #include <WebCore/KURL.h>
 #include <WebCore/PageGroup.h>
 #include <WebCore/SharedBuffer.h>
-#pragma warning( pop )
 #include <functional>
 #include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
diff --git a/Source/WebKit/win/WebHistory.h b/Source/WebKit/win/WebHistory.h
index 17cd3a7..ec7a7a9 100644
--- a/Source/WebKit/win/WebHistory.h
+++ b/Source/WebKit/win/WebHistory.h
@@ -27,9 +27,8 @@
 #define WebHistory_H
 
 #include "WebKit.h"
-
-#include "COMPtr.h"
 #include <CoreFoundation/CoreFoundation.h>
+#include <WebCore/COMPtr.h>
 #include <wtf/Forward.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/RetainPtr.h>
diff --git a/Source/WebKit/win/WebHistoryItem.cpp b/Source/WebKit/win/WebHistoryItem.cpp
index 098eb86..031f8ab 100644
--- a/Source/WebKit/win/WebHistoryItem.cpp
+++ b/Source/WebKit/win/WebHistoryItem.cpp
@@ -31,13 +31,9 @@
 #include "COMPtr.h"
 #include "MarshallingHelpers.h"
 #include "WebKit.h"
-
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/HistoryItem.h>
 #include <WebCore/KURL.h>
-#pragma warning(pop)
-
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RetainPtr.h>
 #include <wtf/text/CString.h>
diff --git a/Source/WebKit/win/WebIconDatabase.cpp b/Source/WebKit/win/WebIconDatabase.cpp
index 5ccf0b7..24e8f41 100644
--- a/Source/WebKit/win/WebIconDatabase.cpp
+++ b/Source/WebKit/win/WebIconDatabase.cpp
@@ -31,14 +31,13 @@
 #include "COMPtr.h"
 #include "WebPreferences.h"
 #include "WebNotificationCenter.h"
-#pragma warning(push, 0)
 #include <WebCore/BitmapInfo.h>
 #include <WebCore/BString.h>
 #include <WebCore/FileSystem.h>
 #include <WebCore/IconDatabase.h>
 #include <WebCore/Image.h>
 #include <WebCore/PlatformString.h>
-#pragma warning(pop)
+#include <WebCore/SharedBuffer.h>
 #include <wtf/MainThread.h>
 #include "shlobj.h"
 
@@ -97,7 +96,7 @@ void WebIconDatabase::startUpIconDatabase()
             LOG_ERROR("Failed to construct default icon database path");
     }
 
-    if (!iconDatabase().open(databasePath))
+    if (!iconDatabase().open(databasePath, WebCore::IconDatabase::defaultDatabaseFilename()))
             LOG_ERROR("Failed to open icon database path");
 }
 
@@ -172,7 +171,7 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::iconForURL(
 
     Image* icon = 0;
     if (url)
-        icon = iconDatabase().iconForPageURL(String(url, SysStringLen(url)), intSize);
+        icon = iconDatabase().synchronousIconForPageURL(String(url, SysStringLen(url)), intSize);
 
     // Make sure we check for the case of an "empty image"
     if (icon && icon->width()) {
@@ -234,7 +233,7 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::iconURLForURL(
 {
     if (!url || !iconURL)
         return E_POINTER;
-    BString iconURLBSTR(iconDatabase().iconURLForPageURL(String(url, SysStringLen(url))));
+    BString iconURLBSTR(iconDatabase().synchronousIconURLForPageURL(String(url, SysStringLen(url))));
     *iconURL = iconURLBSTR.release();
     return S_OK;
 }
@@ -272,11 +271,11 @@ HRESULT STDMETHODCALLTYPE WebIconDatabase::hasIconForURL(
 
     // Passing a size parameter of 0, 0 means we don't care about the result of the image, we just
     // want to make sure the read from disk to load the icon is kicked off.
-    iconDatabase().iconForPageURL(urlString, IntSize(0, 0));
+    iconDatabase().synchronousIconForPageURL(urlString, IntSize(0, 0));
 
     // Check to see if we have a non-empty icon URL for the page, and if we do, we have an icon for
     // the page.
-    *result = !(iconDatabase().iconURLForPageURL(urlString).isEmpty());
+    *result = !(iconDatabase().synchronousIconURLForPageURL(urlString).isEmpty());
 
     return S_OK;
 }
@@ -320,7 +319,13 @@ HBITMAP WebIconDatabase::getOrCreateDefaultIconBitmap(LPSIZE size)
 
 // IconDatabaseClient
 
-void WebIconDatabase::dispatchDidRemoveAllIcons()
+bool WebIconDatabase::performImport()
+{
+    // Windows doesn't do any old-style database importing.
+    return true;
+}
+
+void WebIconDatabase::didRemoveAllIcons()
 {
     // Queueing the empty string is a special way of saying "this queued notification is the didRemoveAllIcons notification"
     MutexLocker locker(m_notificationMutex);
@@ -328,13 +333,29 @@ void WebIconDatabase::dispatchDidRemoveAllIcons()
     scheduleNotificationDelivery();
 }
 
-void WebIconDatabase::dispatchDidAddIconForPageURL(const String& pageURL)
-{   
+void WebIconDatabase::didImportIconURLForPageURL(const WTF::String& pageURL)
+{
     MutexLocker locker(m_notificationMutex);
     m_notificationQueue.append(pageURL.threadsafeCopy());
     scheduleNotificationDelivery();
 }
 
+void WebIconDatabase::didImportIconDataForPageURL(const WTF::String& pageURL)
+{
+    // WebKit1 only has a single "icon did change" notification.
+    didImportIconURLForPageURL(pageURL);
+}
+
+void WebIconDatabase::didChangeIconForPageURL(const WTF::String& pageURL)
+{
+    // WebKit1 only has a single "icon did change" notification.
+    didImportIconURLForPageURL(pageURL);
+}
+
+void WebIconDatabase::didFinishURLImport()
+{
+}
+
 void WebIconDatabase::scheduleNotificationDelivery()
 {
     // Caller of this method must hold the m_notificationQueue lock
diff --git a/Source/WebKit/win/WebIconDatabase.h b/Source/WebKit/win/WebIconDatabase.h
index 178fff8..a895b81 100644
--- a/Source/WebKit/win/WebIconDatabase.h
+++ b/Source/WebKit/win/WebIconDatabase.h
@@ -28,12 +28,9 @@
 
 #include "WebKit.h"
 
-#pragma warning(push, 0)
 #include <WebCore/IconDatabaseClient.h>
 #include <WebCore/IntSize.h>
 #include <WebCore/IntSizeHash.h>
-#pragma warning(pop)
-
 #include <wtf/Vector.h>
 #include <wtf/Threading.h>
 
@@ -107,8 +104,12 @@ public:
         /* [retval][out] */ BOOL* result);
 
     // IconDatabaseClient
-    virtual void dispatchDidRemoveAllIcons();
-    virtual void dispatchDidAddIconForPageURL(const WTF::String&);
+    virtual bool performImport();
+    virtual void didRemoveAllIcons();
+    virtual void didImportIconURLForPageURL(const WTF::String&);
+    virtual void didImportIconDataForPageURL(const WTF::String&);
+    virtual void didChangeIconForPageURL(const WTF::String&);
+    virtual void didFinishURLImport();
 
     static BSTR iconDatabaseDidAddIconNotification();
     static BSTR iconDatabaseDidRemoveAllIconsNotification();
diff --git a/Source/WebKit/win/WebInspector.cpp b/Source/WebKit/win/WebInspector.cpp
index ec35099..976391d 100644
--- a/Source/WebKit/win/WebInspector.cpp
+++ b/Source/WebKit/win/WebInspector.cpp
@@ -31,10 +31,8 @@
 
 #include "WebKitDLL.h"
 #include "WebView.h"
-#pragma warning(push, 0)
 #include <WebCore/InspectorController.h>
 #include <WebCore/Page.h>
-#pragma warning(pop)
 #include <wtf/Assertions.h>
 
 using namespace WebCore;
diff --git a/Source/WebKit/win/WebJavaScriptCollector.cpp b/Source/WebKit/win/WebJavaScriptCollector.cpp
index 42a9da1..cb56b27 100644
--- a/Source/WebKit/win/WebJavaScriptCollector.cpp
+++ b/Source/WebKit/win/WebJavaScriptCollector.cpp
@@ -27,13 +27,11 @@
 #include "WebKitDLL.h"
 #include "WebJavaScriptCollector.h"
 
-#pragma warning(push, 0)
 #include <JavaScriptCore/Heap.h>
 #include <JavaScriptCore/JSGlobalData.h>
 #include <WebCore/GCController.h>
 #include <WebCore/JSDOMWindow.h>
 #include <runtime/JSLock.h>
-#pragma warning(pop)
 
 using namespace JSC;
 using namespace WebCore;
diff --git a/Source/WebKit/win/WebKit.vcproj/Interfaces.vcproj b/Source/WebKit/win/WebKit.vcproj/Interfaces.vcproj
index 555a477..724f98d 100644
--- a/Source/WebKit/win/WebKit.vcproj/Interfaces.vcproj
+++ b/Source/WebKit/win/WebKit.vcproj/Interfaces.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\InterfacesCommon.vsprops"
+			InheritedPropertySheets=".\InterfacesDebug.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -70,7 +70,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\InterfacesCommon.vsprops"
+			InheritedPropertySheets=".\InterfacesRelease.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -120,9 +120,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release_LTCG|Win32"
+			Name="Production|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\InterfacesCommon.vsprops"
+			InheritedPropertySheets=".\InterfacesProduction.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -175,7 +175,7 @@
 		<Configuration
 			Name="Debug_All|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\InterfacesCommon.vsprops"
+			InheritedPropertySheets=".\InterfacesDebugAll.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -227,7 +227,7 @@
 		<Configuration
 			Name="Release_Cairo_CFLite|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\InterfacesCommon.vsprops"
+			InheritedPropertySheets=".\InterfacesReleaseCairoCFLite.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -279,7 +279,7 @@
 		<Configuration
 			Name="Debug_Cairo_CFLite|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\InterfacesCommon.vsprops"
+			InheritedPropertySheets=".\InterfacesDebugCairoCFLite.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -352,7 +352,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -404,7 +404,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -456,7 +456,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -508,7 +508,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -560,7 +560,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -612,7 +612,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -664,7 +664,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -716,7 +716,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -768,7 +768,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -820,7 +820,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -872,7 +872,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -924,7 +924,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -976,7 +976,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1028,7 +1028,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1080,7 +1080,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1132,7 +1132,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1184,7 +1184,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1236,7 +1236,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1316,7 +1316,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1368,7 +1368,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1420,7 +1420,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1472,7 +1472,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1524,7 +1524,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1576,7 +1576,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1628,7 +1628,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1680,7 +1680,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1732,7 +1732,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1784,7 +1784,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1836,7 +1836,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1888,7 +1888,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1940,7 +1940,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -1992,7 +1992,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2044,7 +2044,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2096,7 +2096,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2148,7 +2148,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2200,7 +2200,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2252,7 +2252,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2304,7 +2304,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2356,7 +2356,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2408,7 +2408,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2460,7 +2460,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2512,7 +2512,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2564,7 +2564,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2616,7 +2616,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2668,7 +2668,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2720,7 +2720,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2772,7 +2772,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2824,7 +2824,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2876,7 +2876,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2928,7 +2928,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -2980,7 +2980,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3032,7 +3032,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3084,7 +3084,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3136,7 +3136,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3188,7 +3188,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3240,7 +3240,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3292,7 +3292,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3344,7 +3344,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3396,7 +3396,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3448,7 +3448,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3500,7 +3500,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3552,7 +3552,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3604,7 +3604,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3656,7 +3656,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3708,7 +3708,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3760,7 +3760,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3812,7 +3812,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3864,7 +3864,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3916,7 +3916,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -3968,7 +3968,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4020,7 +4020,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4072,7 +4072,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4124,7 +4124,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4176,7 +4176,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4228,7 +4228,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4280,7 +4280,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4332,7 +4332,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4384,7 +4384,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4436,7 +4436,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4488,7 +4488,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4540,7 +4540,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
@@ -4592,7 +4592,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				>
 				<Tool
 					Name="VCMIDLTool"
@@ -4644,7 +4644,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				ExcludedFromBuild="true"
 				>
 				<Tool
diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesDebug.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesDebug.vsprops
new file mode 100644
index 0000000..263dcb6
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/InterfacesDebug.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="InterfacesDebug"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      .\InterfacesCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesDebugAll.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesDebugAll.vsprops
new file mode 100644
index 0000000..045b788
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/InterfacesDebugAll.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="InterfacesDebugAll"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      .\InterfacesCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesDebugCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesDebugCairoCFLite.vsprops
new file mode 100644
index 0000000..36fcc5a
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/InterfacesDebugCairoCFLite.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="InterfacesDebugCairoCFLite"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;
+      .\InterfacesCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesProduction.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesProduction.vsprops
new file mode 100644
index 0000000..5e71307
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/InterfacesProduction.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="InterfacesProduction"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;
+      .\InterfacesCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesRelease.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesRelease.vsprops
new file mode 100644
index 0000000..77c4b1f
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/InterfacesRelease.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="InterfacesRelease"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      .\InterfacesCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops
new file mode 100644
index 0000000..5e17aee
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/InterfacesReleaseCairoCFLite.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="InterfacesReleaseCairoCFLite"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;
+      .\InterfacesCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKit.make b/Source/WebKit/win/WebKit.vcproj/WebKit.make
index b777d2f..59bd412 100755
--- a/Source/WebKit/win/WebKit.vcproj/WebKit.make
+++ b/Source/WebKit/win/WebKit.vcproj/WebKit.make
@@ -1,7 +1,7 @@
 !IF "$(BUILDSTYLE)"=="DEBUG"
 BUILDSTYLE=Debug_All
 !ELSE
-BUILDSTYLE=Release_LTCG
+BUILDSTYLE=Production
 !ENDIF
 
 install:
@@ -9,7 +9,6 @@ install:
 	set WebKitOutputDir=$(OBJROOT)
 	set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
 	set WebKitVSPropsRedirectionDir=$(SRCROOT)\AppleInternal\tools\vsprops\OpenSource\1\2\3\4\ 
-	set PRODUCTION=1
 	devenv "WebKit.submit.sln" /rebuild $(BUILDSTYLE)
 	-xcopy "%ConfigurationBuildDir%\bin\*.exe" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
 	xcopy "%ConfigurationBuildDir%\bin\*.pdb" "$(DSTROOT)\AppleInternal\bin\" /e/v/i/h/y
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKit.sln b/Source/WebKit/win/WebKit.vcproj/WebKit.sln
index 3b578c5..b2b8d92 100644
--- a/Source/WebKit/win/WebKit.vcproj/WebKit.sln
+++ b/Source/WebKit/win/WebKit.vcproj/WebKit.sln
@@ -159,7 +159,7 @@ Global
 		Debug_Cairo_CFLite|Win32 = Debug_Cairo_CFLite|Win32
 		Debug|Win32 = Debug|Win32
 		Release_Cairo_CFLite|Win32 = Release_Cairo_CFLite|Win32
-		Release_LTCG|Win32 = Release_LTCG|Win32
+		Production|Win32 = Production|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -171,8 +171,8 @@ Global
 		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Debug|Win32.Build.0 = Debug|Win32
 		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Production|Win32.ActiveCfg = Production|Win32
+		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Production|Win32.Build.0 = Production|Win32
 		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.ActiveCfg = Release|Win32
 		{011D10F1-B656-4A1B-A0C3-3842F02122C5}.Release|Win32.Build.0 = Release|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -183,8 +183,8 @@ Global
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.Build.0 = Debug|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|Win32.ActiveCfg = Production|Win32
+		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|Win32.Build.0 = Production|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32
 		{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -195,8 +195,8 @@ Global
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Debug|Win32.Build.0 = Debug|Win32
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Production|Win32.ActiveCfg = Production|Win32
+		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Production|Win32.Build.0 = Production|Win32
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.ActiveCfg = Release|Win32
 		{AA8A5A85-592B-4357-BC60-E0E91E026AF6}.Release|Win32.Build.0 = Release|Win32
 		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -207,8 +207,8 @@ Global
 		{C59E5129-B453-49B7-A52B-1E104715F76E}.Debug|Win32.Build.0 = Debug|Win32
 		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Production|Win32.ActiveCfg = Production|Win32
+		{C59E5129-B453-49B7-A52B-1E104715F76E}.Production|Win32.Build.0 = Production|Win32
 		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.ActiveCfg = Release|Win32
 		{C59E5129-B453-49B7-A52B-1E104715F76E}.Release|Win32.Build.0 = Release|Win32
 		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -219,8 +219,8 @@ Global
 		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Debug|Win32.Build.0 = Debug|Win32
 		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Production|Win32.ActiveCfg = Production|Win32
+		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Production|Win32.Build.0 = Production|Win32
 		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.ActiveCfg = Release|Win32
 		{4FF5BA11-59EC-4C24-8F52-F235C2E7D43A}.Release|Win32.Build.0 = Release|Win32
 		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -231,8 +231,8 @@ Global
 		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Debug|Win32.Build.0 = Debug|Win32
 		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Production|Win32.ActiveCfg = Production|Win32
+		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Production|Win32.Build.0 = Production|Win32
 		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.ActiveCfg = Release|Win32
 		{0A324352-B3B6-496C-9E5B-4C7E923E628B}.Release|Win32.Build.0 = Release|Win32
 		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -241,8 +241,8 @@ Global
 		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.Build.0 = Debug|Win32
 		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
-		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.ActiveCfg = Production|Win32
+		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.Build.0 = Production|Win32
 		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32
 		{E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32
 		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -253,8 +253,8 @@ Global
 		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Debug|Win32.Build.0 = Debug|Win32
 		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Production|Win32.ActiveCfg = Production|Win32
+		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Production|Win32.Build.0 = Production|Win32
 		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release|Win32.ActiveCfg = Release|Win32
 		{1AFD081F-1AC7-4A97-8EFA-6DF97761A3A2}.Release|Win32.Build.0 = Release|Win32
 		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -265,8 +265,8 @@ Global
 		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Debug|Win32.Build.0 = Debug|Win32
 		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Production|Win32.ActiveCfg = Production|Win32
+		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Production|Win32.Build.0 = Production|Win32
 		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.ActiveCfg = Release|Win32
 		{2E51ABE8-76CB-485B-A66C-46AEF4DF8ACD}.Release|Win32.Build.0 = Release|Win32
 		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -277,8 +277,8 @@ Global
 		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Debug|Win32.Build.0 = Debug|Win32
 		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Production|Win32.ActiveCfg = Production|Win32
+		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Production|Win32.Build.0 = Production|Win32
 		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.ActiveCfg = Release|Win32
 		{2EDAD637-CBA8-4E55-97ED-7D2BBC336FDB}.Release|Win32.Build.0 = Release|Win32
 		{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -289,8 +289,8 @@ Global
 		{AAE88FEF-509E-4D49-870B-7357922C276F}.Debug|Win32.Build.0 = Debug|Win32
 		{AAE88FEF-509E-4D49-870B-7357922C276F}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{AAE88FEF-509E-4D49-870B-7357922C276F}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{AAE88FEF-509E-4D49-870B-7357922C276F}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{AAE88FEF-509E-4D49-870B-7357922C276F}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{AAE88FEF-509E-4D49-870B-7357922C276F}.Production|Win32.ActiveCfg = Production|Win32
+		{AAE88FEF-509E-4D49-870B-7357922C276F}.Production|Win32.Build.0 = Production|Win32
 		{AAE88FEF-509E-4D49-870B-7357922C276F}.Release|Win32.ActiveCfg = Release|Win32
 		{AAE88FEF-509E-4D49-870B-7357922C276F}.Release|Win32.Build.0 = Release|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -301,8 +301,8 @@ Global
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug|Win32.Build.0 = Debug|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Production|Win32.ActiveCfg = Production|Win32
+		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Production|Win32.Build.0 = Production|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.ActiveCfg = Release|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.Build.0 = Release|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -313,8 +313,8 @@ Global
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.Build.0 = Debug|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.ActiveCfg = Production|Win32
+		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.Build.0 = Production|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.ActiveCfg = Release|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.Build.0 = Release|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -325,8 +325,8 @@ Global
 		{B8437A41-67BC-4769-9452-45203827F821}.Debug|Win32.Build.0 = Debug|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{B8437A41-67BC-4769-9452-45203827F821}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{B8437A41-67BC-4769-9452-45203827F821}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{B8437A41-67BC-4769-9452-45203827F821}.Production|Win32.ActiveCfg = Production|Win32
+		{B8437A41-67BC-4769-9452-45203827F821}.Production|Win32.Build.0 = Production|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.ActiveCfg = Release|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.Build.0 = Release|Win32
 		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -337,8 +337,8 @@ Global
 		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Debug|Win32.Build.0 = Debug|Win32
 		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Production|Win32.ActiveCfg = Production|Win32
+		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Production|Win32.Build.0 = Production|Win32
 		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.ActiveCfg = Release|Win32
 		{6567DFD4-D6DE-4CD5-825D-17E353D160E1}.Release|Win32.Build.0 = Release|Win32
 		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -349,8 +349,8 @@ Global
 		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Debug|Win32.Build.0 = Debug|Win32
 		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.ActiveCfg = Production|Win32
+		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Production|Win32.Build.0 = Production|Win32
 		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.ActiveCfg = Release|Win32
 		{59CC0547-70AC-499C-9B19-EC01C6F61137}.Release|Win32.Build.0 = Release|Win32
 		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -361,8 +361,8 @@ Global
 		{DA31DA52-6675-48D4-89E0-333A7144397C}.Debug|Win32.Build.0 = Debug|Win32
 		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Production|Win32.ActiveCfg = Production|Win32
+		{DA31DA52-6675-48D4-89E0-333A7144397C}.Production|Win32.Build.0 = Production|Win32
 		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.ActiveCfg = Release|Win32
 		{DA31DA52-6675-48D4-89E0-333A7144397C}.Release|Win32.Build.0 = Release|Win32
 		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -373,8 +373,8 @@ Global
 		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Debug|Win32.Build.0 = Debug|Win32
 		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Production|Win32.ActiveCfg = Production|Win32
+		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Production|Win32.Build.0 = Production|Win32
 		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Release|Win32.ActiveCfg = Release|Win32
 		{44B9C152-1870-4035-B94D-7B3285AA0C12}.Release|Win32.Build.0 = Release|Win32
 		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -385,8 +385,8 @@ Global
 		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Debug|Win32.Build.0 = Debug|Win32
 		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.ActiveCfg = Production|Win32
+		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Production|Win32.Build.0 = Production|Win32
 		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.ActiveCfg = Release|Win32
 		{C0737398-3565-439E-A2B8-AB2BE4D5430C}.Release|Win32.Build.0 = Release|Win32
 		{626089A3-25D3-4883-A96C-B8C66E036397}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -397,8 +397,8 @@ Global
 		{626089A3-25D3-4883-A96C-B8C66E036397}.Debug|Win32.Build.0 = Debug|Win32
 		{626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{626089A3-25D3-4883-A96C-B8C66E036397}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{626089A3-25D3-4883-A96C-B8C66E036397}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{626089A3-25D3-4883-A96C-B8C66E036397}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{626089A3-25D3-4883-A96C-B8C66E036397}.Production|Win32.ActiveCfg = Production|Win32
+		{626089A3-25D3-4883-A96C-B8C66E036397}.Production|Win32.Build.0 = Production|Win32
 		{626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.ActiveCfg = Release|Win32
 		{626089A3-25D3-4883-A96C-B8C66E036397}.Release|Win32.Build.0 = Release|Win32
 		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -409,8 +409,8 @@ Global
 		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Debug|Win32.Build.0 = Debug|Win32
 		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Production|Win32.ActiveCfg = Production|Win32
+		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Production|Win32.Build.0 = Production|Win32
 		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.ActiveCfg = Release|Win32
 		{D09806DB-E58B-4646-8C9B-61101906C1E2}.Release|Win32.Build.0 = Release|Win32
 		{114FCA11-216B-4C8C-957E-30A75AE80443}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -421,8 +421,8 @@ Global
 		{114FCA11-216B-4C8C-957E-30A75AE80443}.Debug|Win32.Build.0 = Debug|Win32
 		{114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{114FCA11-216B-4C8C-957E-30A75AE80443}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{114FCA11-216B-4C8C-957E-30A75AE80443}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{114FCA11-216B-4C8C-957E-30A75AE80443}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.ActiveCfg = Production|Win32
+		{114FCA11-216B-4C8C-957E-30A75AE80443}.Production|Win32.Build.0 = Production|Win32
 		{114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.ActiveCfg = Release|Win32
 		{114FCA11-216B-4C8C-957E-30A75AE80443}.Release|Win32.Build.0 = Release|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -433,8 +433,8 @@ Global
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Debug|Win32.Build.0 = Debug|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{CBC3391C-F060-4BF5-A66E-81404168816B}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{CBC3391C-F060-4BF5-A66E-81404168816B}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{CBC3391C-F060-4BF5-A66E-81404168816B}.Production|Win32.ActiveCfg = Production|Win32
+		{CBC3391C-F060-4BF5-A66E-81404168816B}.Production|Win32.Build.0 = Production|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.ActiveCfg = Release|Win32
 		{CBC3391C-F060-4BF5-A66E-81404168816B}.Release|Win32.Build.0 = Release|Win32
 		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -445,8 +445,8 @@ Global
 		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Debug|Win32.Build.0 = Debug|Win32
 		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Production|Win32.ActiveCfg = Production|Win32
+		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Production|Win32.Build.0 = Production|Win32
 		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.ActiveCfg = Release|Win32
 		{4343BC0B-A2E0-4B48-8277-F33CFBFA83CD}.Release|Win32.Build.0 = Release|Win32
 		{3B99669B-1817-443B-BCBE-835580146668}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -457,8 +457,8 @@ Global
 		{3B99669B-1817-443B-BCBE-835580146668}.Debug|Win32.Build.0 = Debug|Win32
 		{3B99669B-1817-443B-BCBE-835580146668}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{3B99669B-1817-443B-BCBE-835580146668}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{3B99669B-1817-443B-BCBE-835580146668}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{3B99669B-1817-443B-BCBE-835580146668}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{3B99669B-1817-443B-BCBE-835580146668}.Production|Win32.ActiveCfg = Production|Win32
+		{3B99669B-1817-443B-BCBE-835580146668}.Production|Win32.Build.0 = Production|Win32
 		{3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.ActiveCfg = Release|Win32
 		{3B99669B-1817-443B-BCBE-835580146668}.Release|Win32.Build.0 = Release|Win32
 		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -469,8 +469,8 @@ Global
 		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Debug|Win32.Build.0 = Debug|Win32
 		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Production|Win32.ActiveCfg = Production|Win32
+		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Production|Win32.Build.0 = Production|Win32
 		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release|Win32.ActiveCfg = Release|Win32
 		{1480CF5F-4160-47B5-A0E6-96AEC8258FB5}.Release|Win32.Build.0 = Release|Win32
 		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -481,8 +481,8 @@ Global
 		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Debug|Win32.Build.0 = Debug|Win32
 		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Production|Win32.ActiveCfg = Production|Win32
+		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Production|Win32.Build.0 = Production|Win32
 		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.ActiveCfg = Release|Win32
 		{3E48AB23-D249-488F-A1C4-43CDF52FBD28}.Release|Win32.Build.0 = Release|Win32
 		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -493,8 +493,8 @@ Global
 		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Debug|Win32.Build.0 = Debug|Win32
 		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Production|Win32.ActiveCfg = Production|Win32
+		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Production|Win32.Build.0 = Production|Win32
 		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.ActiveCfg = Release|Win32
 		{45C45411-7F0E-404D-919A-4EE9BB60BE86}.Release|Win32.Build.0 = Release|Win32
 		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
@@ -505,8 +505,8 @@ Global
 		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Debug|Win32.Build.0 = Debug|Win32
 		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_Cairo_CFLite|Win32.ActiveCfg = Release_Cairo_CFLite|Win32
 		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_Cairo_CFLite|Win32.Build.0 = Release_Cairo_CFLite|Win32
-		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Production|Win32.ActiveCfg = Production|Win32
+		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Production|Win32.Build.0 = Production|Win32
 		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release|Win32.ActiveCfg = Release|Win32
 		{B0101604-B483-4F8C-9C51-90B46A2B1CD3}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKit.submit.sln b/Source/WebKit/win/WebKit.vcproj/WebKit.submit.sln
index 8f431f1..e873b11 100644
--- a/Source/WebKit/win/WebKit.vcproj/WebKit.submit.sln
+++ b/Source/WebKit/win/WebKit.vcproj/WebKit.submit.sln
@@ -18,7 +18,7 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_All|Win32 = Debug_All|Win32
 		Debug|Win32 = Debug|Win32
-		Release_LTCG|Win32 = Release_LTCG|Win32
+		Production|Win32 = Production|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
@@ -26,24 +26,24 @@ Global
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug_All|Win32.Build.0 = Debug_All|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.Build.0 = Debug|Win32
-		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.ActiveCfg = Production|Win32
+		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.Build.0 = Production|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.ActiveCfg = Release|Win32
 		{0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.Build.0 = Release|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Debug_All|Win32.Build.0 = Debug_All|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Debug|Win32.Build.0 = Debug|Win32
-		{B8437A41-67BC-4769-9452-45203827F821}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{B8437A41-67BC-4769-9452-45203827F821}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{B8437A41-67BC-4769-9452-45203827F821}.Production|Win32.ActiveCfg = Production|Win32
+		{B8437A41-67BC-4769-9452-45203827F821}.Production|Win32.Build.0 = Production|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.ActiveCfg = Release|Win32
 		{B8437A41-67BC-4769-9452-45203827F821}.Release|Win32.Build.0 = Release|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.ActiveCfg = Debug_All|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug_All|Win32.Build.0 = Debug_All|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug|Win32.ActiveCfg = Debug|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Debug|Win32.Build.0 = Debug|Win32
-		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_LTCG|Win32.ActiveCfg = Release_LTCG|Win32
-		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release_LTCG|Win32.Build.0 = Release_LTCG|Win32
+		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Production|Win32.ActiveCfg = Production|Win32
+		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Production|Win32.Build.0 = Production|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.ActiveCfg = Release|Win32
 		{91762BE2-87EF-4F5A-A480-48B90EB3F406}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj b/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj
index d1aa3c6..a8b9cc3 100644
--- a/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj
+++ b/Source/WebKit/win/WebKit.vcproj/WebKit.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitLibCommon.vsprops"
+			InheritedPropertySheets=".\WebKitLibDebug.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -70,7 +70,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitLibCommon.vsprops"
+			InheritedPropertySheets=".\WebKitLibRelease.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -122,7 +122,7 @@
 		<Configuration
 			Name="Debug_Cairo_CFLite|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKitLibCommon.vsprops"
+			InheritedPropertySheets=".\WebKitLibDebugCairoCFLite.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -174,7 +174,7 @@
 		<Configuration
 			Name="Release_Cairo_CFLite|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;.\WebKitLibCommon.vsprops"
+			InheritedPropertySheets=".\WebKitLibReleaseCairoCFLite.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -226,7 +226,7 @@
 		<Configuration
 			Name="Debug_All|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitLibCommon.vsprops"
+			InheritedPropertySheets=".\WebKitLibDebugAll.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -276,9 +276,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release_LTCG|Win32"
+			Name="Production|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitLibCommon.vsprops"
+			InheritedPropertySheets=".\WebKitLibProduction.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -827,7 +827,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release_LTCG|Win32"
+					Name="Production|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -903,7 +903,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release_LTCG|Win32"
+					Name="Production|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -1079,7 +1079,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release_LTCG|Win32"
+					Name="Production|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
@@ -1301,7 +1301,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release_LTCG|Win32"
+				Name="Production|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUID.vcproj b/Source/WebKit/win/WebKit.vcproj/WebKitGUID.vcproj
index 5d1abd2..f087413 100644
--- a/Source/WebKit/win/WebKit.vcproj/WebKitGUID.vcproj
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUID.vcproj
@@ -18,7 +18,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;.\WebKitGUIDCommon.vsprops"
+			InheritedPropertySheets=".\WebKitGUIDDebug.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -71,7 +71,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitGUIDCommon.vsprops"
+			InheritedPropertySheets=".\WebKitGUIDRelease.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -124,7 +124,7 @@
 		<Configuration
 			Name="Debug_All|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;.\WebKitGUIDCommon.vsprops"
+			InheritedPropertySheets=".\WebKitGUIDDebugAll.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -175,9 +175,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release_LTCG|Win32"
+			Name="Production|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;.\WebKitGUIDCommon.vsprops"
+			InheritedPropertySheets=".\WebKitGUIDProduction.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -231,7 +231,7 @@
 		<Configuration
 			Name="Release_Cairo_CFLite|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;.\WebKitGUIDCommon.vsprops"
+			InheritedPropertySheets=".\WebKitGUIDReleaseCairoCFLite.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -284,7 +284,7 @@
 		<Configuration
 			Name="Debug_Cairo_CFLite|Win32"
 			ConfigurationType="4"
-			InheritedPropertySheets="$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;$(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;.\WebKitGUIDCommon.vsprops"
+			InheritedPropertySheets=".\WebKitGUIDDebugCairoCFLite.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebug.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebug.vsprops
new file mode 100644
index 0000000..2038998
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebug.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitGUIDDebug"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      .\WebKitGUIDCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebugAll.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebugAll.vsprops
new file mode 100644
index 0000000..ccd2847
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebugAll.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitGUIDDebugAll"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;
+      .\WebKitGUIDCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebugCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebugCairoCFLite.vsprops
new file mode 100644
index 0000000..abbdd3e
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDDebugCairoCFLite.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitGUIDDebugCairoCFLite"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;
+      .\WebKitGUIDCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDProduction.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDProduction.vsprops
new file mode 100644
index 0000000..941bf46
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDProduction.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitGUIDProduction"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;
+      .\WebKitGUIDCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDRelease.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDRelease.vsprops
new file mode 100644
index 0000000..39566ea
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDRelease.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitGUIDRelease"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      .\WebKitGUIDCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops
new file mode 100644
index 0000000..bc0b7a1
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitGUIDReleaseCairoCFLite.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitGUIDReleaseCairoCFLite"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;
+      .\WebKitGUIDCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibDebug.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibDebug.vsprops
new file mode 100644
index 0000000..0e003e5
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibDebug.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitLibDebug"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      .\WebKitLibCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugAll.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugAll.vsprops
new file mode 100644
index 0000000..005cee7
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugAll.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitLibDebugAll"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_all.vsprops;
+      .\WebKitLibCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugCairoCFLite.vsprops
new file mode 100644
index 0000000..355350d
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibDebugCairoCFLite.vsprops
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitLibDebugCairoCFLite"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\debug_wincairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;
+      .\WebKitLibCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops
new file mode 100644
index 0000000..127707e
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibProduction.vsprops
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitProduction"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\production.vsprops;
+      .\WebKitLibCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops
new file mode 100644
index 0000000..82f6dfd
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibRelease.vsprops
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitLibRelease"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefines.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      .\WebKitLibCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops b/Source/WebKit/win/WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops
new file mode 100644
index 0000000..692fdc0
--- /dev/null
+++ b/Source/WebKit/win/WebKit.vcproj/WebKitLibReleaseCairoCFLite.vsprops
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="WebKitLibReleaseCairoCFLite"
+	InheritedPropertySheets="
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\FeatureDefinesCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\common.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\release.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\WinCairo.vsprops;
+      $(WebKitVSPropsRedirectionDir)..\..\..\..\WebKitLibraries\win\tools\vsprops\cURL.vsprops;
+      .\WebKitLibCommon.vsprops"
+	>
+</VisualStudioPropertySheet>
diff --git a/Source/WebKit/win/WebKitCOMAPI.h b/Source/WebKit/win/WebKitCOMAPI.h
index 598ac2d..a9e6dad 100644
--- a/Source/WebKit/win/WebKitCOMAPI.h
+++ b/Source/WebKit/win/WebKitCOMAPI.h
@@ -26,6 +26,8 @@
 #ifndef WebKitCOMAPI_h
 #define WebKitCOMAPI_h
 
+#include <unknwn.h>
+
 extern "C" {
 
 // Callers should use this API instead of CoCreateInstance to instantiate WebKit COM classes.
diff --git a/Source/WebKit/win/WebKitClassFactory.h b/Source/WebKit/win/WebKitClassFactory.h
index 90a43c2..85ad843 100644
--- a/Source/WebKit/win/WebKitClassFactory.h
+++ b/Source/WebKit/win/WebKitClassFactory.h
@@ -26,6 +26,8 @@
 #ifndef WebKitClassFactory_H
 #define WebKitClassFactory_H
 
+#include <unknwn.h>
+
 class WebKitClassFactory : public IClassFactory
 {
 public:
diff --git a/Source/WebKit/win/WebKitDLL.cpp b/Source/WebKit/win/WebKitDLL.cpp
index d6a5120..ef85608 100644
--- a/Source/WebKit/win/WebKitDLL.cpp
+++ b/Source/WebKit/win/WebKitDLL.cpp
@@ -38,9 +38,9 @@
 #include <WebCore/SharedBuffer.h>
 #include <WebCore/WebCoreInstanceHandle.h>
 #include <WebCore/Widget.h>
-#include <wtf/Vector.h>
-#include <tchar.h>
 #include <olectl.h>
+#include <wchar.h>
+#include <wtf/Vector.h>
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebKitGraphics.cpp b/Source/WebKit/win/WebKitGraphics.cpp
index b130002..216b7b7 100644
--- a/Source/WebKit/win/WebKitGraphics.cpp
+++ b/Source/WebKit/win/WebKitGraphics.cpp
@@ -31,7 +31,6 @@
 
 #include "WebPreferences.h"
 
-#pragma warning(push, 0)
 #include <WebCore/Font.h>
 #include <WebCore/FontDescription.h>
 #include <WebCore/FontSelector.h>
@@ -42,7 +41,6 @@
 #include <wtf/unicode/CharacterNames.h>
 
 #include <CoreGraphics/CoreGraphics.h>
-#pragma warning(pop)
 
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 
diff --git a/Source/WebKit/win/WebKitSystemBits.cpp b/Source/WebKit/win/WebKitSystemBits.cpp
index eec6361..c77a78b 100644
--- a/Source/WebKit/win/WebKitSystemBits.cpp
+++ b/Source/WebKit/win/WebKitSystemBits.cpp
@@ -29,12 +29,9 @@
 #include "config.h"
 #include "WebKitSystemBits.h"
 
-#pragma warning(push, 0)
+#include <CoreFoundation/CoreFoundation.h>
 #include <WebCore/PlatformString.h>
-#pragma warning(pop)
-
 #include <windows.h>
-#include <CoreFoundation/CoreFoundation.h>
 
 unsigned long long WebMemorySize()
 {
diff --git a/Source/WebKit/win/WebLocalizableStrings.cpp b/Source/WebKit/win/WebLocalizableStrings.cpp
index e9b99ad..b05c55e 100644
--- a/Source/WebKit/win/WebLocalizableStrings.cpp
+++ b/Source/WebKit/win/WebLocalizableStrings.cpp
@@ -28,11 +28,9 @@
 
 #include "WebLocalizableStrings.h"
 
-#pragma warning(push, 0)
 #include <WebCore/PlatformString.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>
-#pragma warning(pop)
 
 #include <wtf/Assertions.h>
 #include <wtf/HashMap.h>
diff --git a/Source/WebKit/win/WebMutableURLRequest.cpp b/Source/WebKit/win/WebMutableURLRequest.cpp
index 02829d7..5aac756 100644
--- a/Source/WebKit/win/WebMutableURLRequest.cpp
+++ b/Source/WebKit/win/WebMutableURLRequest.cpp
@@ -30,17 +30,18 @@
 #include "WebKit.h"
 #include "MarshallingHelpers.h"
 #include "WebKit.h"
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/COMPtr.h>
 #include <WebCore/FormData.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/ResourceHandle.h>
 #include <wtf/text/CString.h>
-#pragma warning(pop)
-
 #include <wtf/RetainPtr.h>
 
+#if USE(CF)
+#include <WebCore/CertificateCFWin.h>
+#endif
+
 #if USE(CFNETWORK)
 #include <CFNetwork/CFURLRequestPriv.h>
 #endif
@@ -350,26 +351,6 @@ HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setAllowsAnyHTTPSCertificate(voi
     return S_OK;
 }
 
-static void deallocCertContext(void* ptr, void* info)
-{
-    if (ptr)
-        CertFreeCertificateContext(reinterpret_cast<PCCERT_CONTEXT>(ptr));
-}
-
-static CFDataRef copyCert(PCCERT_CONTEXT cert)
-{
-    static CFAllocatorRef certDealloc;
-    PCCERT_CONTEXT certCopy = 0;
-    if (!certDealloc) {
-        CFAllocatorContext allocContext = {
-            0, 0, 0, 0, 0, 0, 0, deallocCertContext, 0
-        };
-        certDealloc = CFAllocatorCreate(kCFAllocatorDefault, &allocContext);
-    }
-    certCopy = CertDuplicateCertificateContext(cert);
-    return CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(certCopy), sizeof(*certCopy), certDealloc);
-}
-
 HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setClientCertificate(
     /* [in] */ OLE_HANDLE cert)
 {
@@ -377,7 +358,7 @@ HRESULT STDMETHODCALLTYPE WebMutableURLRequest::setClientCertificate(
         return E_POINTER;
 
     PCCERT_CONTEXT certContext = reinterpret_cast<PCCERT_CONTEXT>((ULONG64)cert);
-    RetainPtr<CFDataRef> certData(AdoptCF, copyCert(certContext));
+    RetainPtr<CFDataRef> certData = WebCore::copyCertificateToData(certContext);
     ResourceHandle::setClientCertificate(m_request.url().host(), certData.get());
     return S_OK;
 }
diff --git a/Source/WebKit/win/WebMutableURLRequest.h b/Source/WebKit/win/WebMutableURLRequest.h
index 77dc1a0..0f89676 100644
--- a/Source/WebKit/win/WebMutableURLRequest.h
+++ b/Source/WebKit/win/WebMutableURLRequest.h
@@ -27,9 +27,7 @@
 #define WebMutableURLRequest_H
 
 #include "WebKit.h"
-#pragma warning(push, 0)
 #include <WebCore/ResourceRequest.h>
-#pragma warning(pop)
 
 namespace WebCore
 {
diff --git a/Source/WebKit/win/WebNodeHighlight.cpp b/Source/WebKit/win/WebNodeHighlight.cpp
index c4bf181..0e51b1c 100644
--- a/Source/WebKit/win/WebNodeHighlight.cpp
+++ b/Source/WebKit/win/WebNodeHighlight.cpp
@@ -30,14 +30,12 @@
 #include "WebNodeHighlight.h"
 
 #include "WebView.h"
-#pragma warning(push, 0)
 #include <WebCore/BitmapInfo.h>
 #include <WebCore/Color.h>
 #include <WebCore/GraphicsContext.h>
 #include <WebCore/InspectorController.h>
 #include <WebCore/Page.h>
 #include <WebCore/WindowMessageBroadcaster.h>
-#pragma warning(pop)
 #include <wtf/OwnPtr.h>
 #include <wtf/HashSet.h>
 
diff --git a/Source/WebKit/win/WebNodeHighlight.h b/Source/WebKit/win/WebNodeHighlight.h
index de347d3..1d154f9 100644
--- a/Source/WebKit/win/WebNodeHighlight.h
+++ b/Source/WebKit/win/WebNodeHighlight.h
@@ -29,10 +29,7 @@
 #ifndef WebNodeHighlight_h
 #define WebNodeHighlight_h
 
-#pragma warning(push, 0)
 #include <WebCore/WindowMessageListener.h>
-#pragma warning(pop)
-
 #include <windows.h>
 
 class WebView;
diff --git a/Source/WebKit/win/WebNotificationCenter.cpp b/Source/WebKit/win/WebNotificationCenter.cpp
index 6c22224..e30f066 100644
--- a/Source/WebKit/win/WebNotificationCenter.cpp
+++ b/Source/WebKit/win/WebNotificationCenter.cpp
@@ -28,16 +28,14 @@
 #include "WebNotificationCenter.h"
 
 #include "WebNotification.h"
-#pragma warning(push, 0)
 #include <WebCore/COMPtr.h>
 #include <WebCore/PlatformString.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashTraits.h>
 #include <wtf/Vector.h>
 #include <wtf/text/StringHash.h>
-#pragma warning(pop)
-#include <tchar.h>
 #include <utility>
+#include <wchar.h>
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebPreferences.cpp b/Source/WebKit/win/WebPreferences.cpp
index 01cab2b..a4869b6 100644
--- a/Source/WebKit/win/WebPreferences.cpp
+++ b/Source/WebKit/win/WebPreferences.cpp
@@ -40,7 +40,7 @@
 #include <WebCore/PlatformString.h>
 #include <limits>
 #include <shlobj.h>
-#include <tchar.h>
+#include <wchar.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/text/CString.h>
@@ -340,12 +340,12 @@ LONGLONG WebPreferences::longlongValueForKey(CFStringRef key)
 void WebPreferences::setStringValue(CFStringRef key, LPCTSTR value)
 {
     BSTR val = stringValueForKey(key);
-    if (val && !_tcscmp(val, value))
+    if (val && !wcscmp(val, value))
         return;
     SysFreeString(val);
     
     RetainPtr<CFStringRef> valueRef(AdoptCF,
-        CFStringCreateWithCharactersNoCopy(0, (UniChar*)_wcsdup(value), (CFIndex)_tcslen(value), kCFAllocatorMalloc));
+        CFStringCreateWithCharactersNoCopy(0, (UniChar*)_wcsdup(value), (CFIndex)wcslen(value), kCFAllocatorMalloc));
     setValueForKey(key, valueRef.get());
 
     postPreferencesChangesNotification();
diff --git a/Source/WebKit/win/WebResource.cpp b/Source/WebKit/win/WebResource.cpp
index 506e55d..ccfd95d 100644
--- a/Source/WebKit/win/WebResource.cpp
+++ b/Source/WebKit/win/WebResource.cpp
@@ -29,10 +29,7 @@
 
 #include "MarshallingHelpers.h"
 #include "MemoryStream.h"
-
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebResource.h b/Source/WebKit/win/WebResource.h
index 7c6759a..611803e 100644
--- a/Source/WebKit/win/WebResource.h
+++ b/Source/WebKit/win/WebResource.h
@@ -28,14 +28,11 @@
 
 #include "WebKit.h"
 #include "COMPtr.h"
-
-#pragma warning(push, 0)
 #include <WebCore/KURL.h>
 #include <WebCore/PlatformString.h>
 #include <WebCore/ResourceResponse.h>
 #include <WebCore/SharedBuffer.h>
 #include <wtf/PassRefPtr.h>
-#pragma warning(pop)
 
 class WebResource : public IWebResource {
 public:
diff --git a/Source/WebKit/win/WebScriptWorld.h b/Source/WebKit/win/WebScriptWorld.h
index 01511de..4b0fa48 100644
--- a/Source/WebKit/win/WebScriptWorld.h
+++ b/Source/WebKit/win/WebScriptWorld.h
@@ -25,6 +25,7 @@
 #ifndef WebScriptWorld_h
 #define WebScriptWorld_h
 
+#include "WebKit.h"
 #include <WebCore/COMPtr.h>
 
 namespace WebCore {
diff --git a/Source/WebKit/win/WebScrollBar.cpp b/Source/WebKit/win/WebScrollBar.cpp
index 9f0131b..224a72a 100644
--- a/Source/WebKit/win/WebScrollBar.cpp
+++ b/Source/WebKit/win/WebScrollBar.cpp
@@ -28,12 +28,10 @@
 #include "WebKit.h"
 #include "WebScrollBar.h"
 
-#pragma warning(push, 0)
 #include <WebCore/GraphicsContext.h>
 #include <WebCore/PlatformMouseEvent.h>
 #include <WebCore/Scrollbar.h>
 #include <WebCore/ScrollbarTheme.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
@@ -145,6 +143,7 @@ HRESULT STDMETHODCALLTYPE WebScrollBar::setValue(
     /* [in] */ int value)
 {
     m_currentPosition = value;
+    ScrollableArea::scrollToOffsetWithoutAnimation(m_scrollBar->orientation(), m_currentPosition);
     return S_OK;
 }
 
diff --git a/Source/WebKit/win/WebScrollBar.h b/Source/WebKit/win/WebScrollBar.h
index 39457d4..0482419 100644
--- a/Source/WebKit/win/WebScrollBar.h
+++ b/Source/WebKit/win/WebScrollBar.h
@@ -31,11 +31,9 @@
 #include <wtf/RefPtr.h>
 #include <wtf/OwnPtr.h>
 
-#pragma warning(push, 0)
 #include <WebCore/COMPtr.h>
 #include <WebCore/Scrollbar.h>
 #include <WebCore/ScrollableArea.h>
-#pragma warning(pop)
 
 namespace WebCore {
 class Scrollbar;
diff --git a/Source/WebKit/win/WebSerializedJSValue.h b/Source/WebKit/win/WebSerializedJSValue.h
index 6e3747d..61e5617 100644
--- a/Source/WebKit/win/WebSerializedJSValue.h
+++ b/Source/WebKit/win/WebSerializedJSValue.h
@@ -25,6 +25,7 @@
 #ifndef WebSerializedJSValue_h
 #define WebSerializedJSValue_h
 
+#include "WebKit.h"
 #include <WebCore/COMPtr.h>
 
 typedef const struct OpaqueJSContext* JSContextRef;
diff --git a/Source/WebKit/win/WebURLAuthenticationChallenge.cpp b/Source/WebKit/win/WebURLAuthenticationChallenge.cpp
index c711450..1663376 100644
--- a/Source/WebKit/win/WebURLAuthenticationChallenge.cpp
+++ b/Source/WebKit/win/WebURLAuthenticationChallenge.cpp
@@ -35,11 +35,8 @@
 #include "WebURLProtectionSpace.h"
 #include "WebURLResponse.h"
 #include "WebKit.h"
-
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
 #include <WebCore/ResourceHandle.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebURLAuthenticationChallenge.h b/Source/WebKit/win/WebURLAuthenticationChallenge.h
index d0eba20..dfc5733 100644
--- a/Source/WebKit/win/WebURLAuthenticationChallenge.h
+++ b/Source/WebKit/win/WebURLAuthenticationChallenge.h
@@ -27,11 +27,8 @@
 #define WebURLAuthenticationChallenge_h
 
 #include "WebKit.h"
-
-#pragma warning(push, 0)
 #include <WebCore/AuthenticationChallenge.h>
 #include <WebCore/COMPtr.h>
-#pragma warning(pop)
 
 class DECLSPEC_UUID("FD3B2381-0BB6-4B59-AF09-0E599C8901CF") WebURLAuthenticationChallenge : public IWebURLAuthenticationChallenge {
 public:
diff --git a/Source/WebKit/win/WebURLAuthenticationChallengeSender.cpp b/Source/WebKit/win/WebURLAuthenticationChallengeSender.cpp
index 1257d41..0a9154f 100644
--- a/Source/WebKit/win/WebURLAuthenticationChallengeSender.cpp
+++ b/Source/WebKit/win/WebURLAuthenticationChallengeSender.cpp
@@ -32,10 +32,7 @@
 #include "WebKit.h"
 #include "WebURLAuthenticationChallenge.h"
 #include "WebURLCredential.h"
-
-#pragma warning(push, 0)
 #include <WebCore/AuthenticationClient.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebURLAuthenticationChallengeSenderCFNet.cpp b/Source/WebKit/win/WebURLAuthenticationChallengeSenderCFNet.cpp
index f756391..3d329d1 100644
--- a/Source/WebKit/win/WebURLAuthenticationChallengeSenderCFNet.cpp
+++ b/Source/WebKit/win/WebURLAuthenticationChallengeSenderCFNet.cpp
@@ -32,10 +32,7 @@
 #include "WebKit.h"
 #include "WebURLAuthenticationChallenge.h"
 #include "WebURLCredential.h"
-
-#pragma warning(push, 0)
 #include <WebCore/AuthenticationClient.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp b/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp
index 2cf9a75..2f49f67 100644
--- a/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp
+++ b/Source/WebKit/win/WebURLAuthenticationChallengeSenderCurl.cpp
@@ -33,10 +33,7 @@
 #include "WebKit.h"
 #include "WebURLAuthenticationChallenge.h"
 #include "WebURLCredential.h"
-
-#pragma warning(push, 0)
 #include <WebCore/ResourceHandle.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebURLCredential.cpp b/Source/WebKit/win/WebURLCredential.cpp
index 82cf78c..0d9ac34 100644
--- a/Source/WebKit/win/WebURLCredential.cpp
+++ b/Source/WebKit/win/WebURLCredential.cpp
@@ -28,9 +28,7 @@
 #include "WebURLCredential.h"
 
 #include "WebKit.h"
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebURLCredential.h b/Source/WebKit/win/WebURLCredential.h
index 094c966..11f3755 100644
--- a/Source/WebKit/win/WebURLCredential.h
+++ b/Source/WebKit/win/WebURLCredential.h
@@ -27,10 +27,7 @@
 #define WebURLCredential_h
 
 #include "WebKit.h"
-
-#pragma warning(push, 0)
 #include <WebCore/Credential.h>
-#pragma warning(pop)
 
 class WebURLCredential : public IWebURLCredential
 {
diff --git a/Source/WebKit/win/WebURLProtectionSpace.cpp b/Source/WebKit/win/WebURLProtectionSpace.cpp
index 6086abb..98a727e 100644
--- a/Source/WebKit/win/WebURLProtectionSpace.cpp
+++ b/Source/WebKit/win/WebURLProtectionSpace.cpp
@@ -28,9 +28,7 @@
 #include "WebKitDLL.h"
 #include "WebURLProtectionSpace.h"
 
-#pragma warning(push, 0)
 #include <WebCore/BString.h>
-#pragma warning(pop)
 
 using namespace WebCore;
 
diff --git a/Source/WebKit/win/WebURLProtectionSpace.h b/Source/WebKit/win/WebURLProtectionSpace.h
index 579d21b..c1f763f 100644
--- a/Source/WebKit/win/WebURLProtectionSpace.h
+++ b/Source/WebKit/win/WebURLProtectionSpace.h
@@ -27,10 +27,7 @@
 #define WebURLProtectionSpace_h
 
 #include "WebKit.h"
-
-#pragma warning(push, 0)
 #include <WebCore/ProtectionSpace.h>
-#pragma warning(pop)
 
 class WebURLProtectionSpace : public IWebURLProtectionSpace
 {
diff --git a/Source/WebKit/win/WebURLResponse.cpp b/Source/WebKit/win/WebURLResponse.cpp
index 644e1d8..b6c94dd 100644
--- a/Source/WebKit/win/WebURLResponse.cpp
+++ b/Source/WebKit/win/WebURLResponse.cpp
@@ -38,14 +38,12 @@
 #endif
 
 #include <wtf/platform.h>
-#pragma warning( push, 0 )
 #include <WebCore/BString.h>
 #include <WebCore/KURL.h>
 #include <WebCore/ResourceHandle.h>
-#pragma warning( pop )
 #include <shlobj.h>
 #include <shlwapi.h>
-#include <tchar.h>
+#include <wchar.h>
 
 using namespace WebCore;
 
@@ -410,7 +408,7 @@ HRESULT STDMETHODCALLTYPE WebURLResponse::sslPeerCertificate(
     CFDictionaryRef dict = certificateDictionary();
     if (!dict)
         return E_FAIL;
-    void* data = wkGetSSLPeerCertificateData(dict);
+    void* data = wkGetSSLPeerCertificateDataBytePtr(dict);
     if (!data)
         return E_FAIL;
     *result = (OLE_HANDLE)(ULONG64)data;
@@ -439,21 +437,21 @@ HRESULT WebURLResponse::suggestedFileExtension(BSTR *result)
         err = RegOpenKeyEx(key, mimeType, 0, KEY_QUERY_VALUE, &subKey);
         if (!err) {
             DWORD keyType = REG_SZ;
-            TCHAR extension[MAX_PATH];
+            WCHAR extension[MAX_PATH];
             DWORD keySize = sizeof(extension)/sizeof(extension[0]);
             err = RegQueryValueEx(subKey, TEXT("Extension"), 0, &keyType, (LPBYTE)extension, &keySize);
             if (!err && keyType != REG_SZ)
                 err = ERROR_INVALID_DATA;
             if (err) {
                 // fallback handlers
-                if (!_tcscmp(mimeType, TEXT("text/html"))) {
-                    _tcscpy(extension, TEXT(".html"));
+                if (!wcscmp(mimeType, L"text/html")) {
+                    wcscpy(extension, L".html");
                     err = 0;
-                } else if (!_tcscmp(mimeType, TEXT("application/xhtml+xml"))) {
-                    _tcscpy(extension, TEXT(".xhtml"));
+                } else if (!wcscmp(mimeType, L"application/xhtml+xml")) {
+                    wcscpy(extension, L".xhtml");
                     err = 0;
-                } else if (!_tcscmp(mimeType, TEXT("image/svg+xml"))) {
-                    _tcscpy(extension, TEXT(".svg"));
+                } else if (!wcscmp(mimeType, L"image/svg+xml")) {
+                    wcscpy(extension, L".svg");
                     err = 0;
                 }
             }
diff --git a/Source/WebKit/win/WebURLResponse.h b/Source/WebKit/win/WebURLResponse.h
index 761ca8e..8e82a2b 100644
--- a/Source/WebKit/win/WebURLResponse.h
+++ b/Source/WebKit/win/WebURLResponse.h
@@ -27,10 +27,7 @@
 #define WebURLResponse_H
 
 #include "WebKit.h"
-
-#pragma warning(push, 0)
 #include <WebCore/ResourceResponse.h>
-#pragma warning(pop)
 
 class WebURLResponse : public IWebHTTPURLResponse, IWebURLResponsePrivate
 {
diff --git a/Source/WebKit/win/WebUserContentURLPattern.h b/Source/WebKit/win/WebUserContentURLPattern.h
index 42854b4..8864093 100644
--- a/Source/WebKit/win/WebUserContentURLPattern.h
+++ b/Source/WebKit/win/WebUserContentURLPattern.h
@@ -25,6 +25,7 @@
 #ifndef WebUserContentURLPattern_h
 #define WebUserContentURLPattern_h
 
+#include "WebKit.h"
 #include <WebCore/COMPtr.h>
 #include <WebCore/UserContentURLPattern.h>
 
diff --git a/Source/WebKit/win/WebView.cpp b/Source/WebKit/win/WebView.cpp
index 0fb8047..69f83de 100644
--- a/Source/WebKit/win/WebView.cpp
+++ b/Source/WebKit/win/WebView.cpp
@@ -128,6 +128,7 @@
 #include <WebCore/SelectionController.h>
 #include <WebCore/Settings.h>
 #include <WebCore/SimpleFontData.h>
+#include <WebCore/SystemInfo.h>
 #include <WebCore/TypingCommand.h>
 #include <WebCore/WindowMessageBroadcaster.h>
 #include <wtf/Threading.h>
@@ -161,7 +162,7 @@
 #include <comutil.h>
 #include <dimm.h>
 #include <oleacc.h>
-#include <tchar.h>
+#include <wchar.h>
 #include <windowsx.h>
 #include <wtf/HashSet.h>
 #include <wtf/text/CString.h>
@@ -184,8 +185,7 @@ using JSC::JSLock;
 static HMODULE accessibilityLib;
 static HashSet<WebView*> pendingDeleteBackingStoreSet;
 
-static String osVersion();
-static String webKitVersion();
+static String webKitVersionString();
 
 WebView* kit(Page* page)
 {
@@ -1244,9 +1244,10 @@ bool WebView::canHandleRequest(const WebCore::ResourceRequest& request)
 
 String WebView::standardUserAgentWithApplicationName(const String& applicationName)
 {
-    if (applicationName.isEmpty())
-        return makeString("Mozilla/5.0 (", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko)");
-    return makeString("Mozilla/5.0 (", osVersion(), ") AppleWebKit/", webKitVersion(), " (KHTML, like Gecko) ", applicationName);
+    DEFINE_STATIC_LOCAL(String, osVersion, (windowsVersionForUAString()));
+    DEFINE_STATIC_LOCAL(String, webKitVersion, (webKitVersionString()));
+
+    return makeString("Mozilla/5.0 (", osVersion, ") AppleWebKit/", webKitVersion, " (KHTML, like Gecko)", applicationName.isEmpty() ? "" : " ", applicationName);
 }
 
 Page* WebView::page()
@@ -1675,12 +1676,12 @@ bool WebView::mouseWheel(WPARAM wParam, LPARAM lParam, bool isMouseHWheel)
     HWND focusedWindow = GetFocus();
     if (focusedWindow && focusedWindow != m_viewWindow) {
         // Our focus is on a different hwnd, see if it's a PopupMenu and if so, set the focus back on us (which will hide the popup).
-        TCHAR className[256];
+        WCHAR className[256];
 
         // Make sure truncation won't affect the comparison.
-        ASSERT(WTF_ARRAY_LENGTH(className) > _tcslen(PopupMenuWin::popupClassName()));
+        ASSERT(WTF_ARRAY_LENGTH(className) > wcslen(PopupMenuWin::popupClassName()));
 
-        if (GetClassName(focusedWindow, className, WTF_ARRAY_LENGTH(className)) && !_tcscmp(className, PopupMenuWin::popupClassName())) {
+        if (GetClassNameW(focusedWindow, className, WTF_ARRAY_LENGTH(className)) && !wcscmp(className, PopupMenuWin::popupClassName())) {
             // We don't let the WebView scroll here for two reasons - 1) To match Firefox behavior, 2) If we do scroll, we lose the
             // focus ring around the select menu.
             SetFocus(m_viewWindow);
@@ -2336,31 +2337,7 @@ bool WebView::developerExtrasEnabled() const
 #endif
 }
 
-static String osVersion()
-{
-    String osVersion;
-    OSVERSIONINFO versionInfo = {0};
-    versionInfo.dwOSVersionInfoSize = sizeof(versionInfo);
-    GetVersionEx(&versionInfo);
-
-    if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
-        if (versionInfo.dwMajorVersion == 4) {
-            if (versionInfo.dwMinorVersion == 0)
-                osVersion = "Windows 95";
-            else if (versionInfo.dwMinorVersion == 10)
-                osVersion = "Windows 98";
-            else if (versionInfo.dwMinorVersion == 90)
-                osVersion = "Windows 98; Win 9x 4.90";
-        }
-    } else if (versionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
-        osVersion = makeString("Windows NT ", String::number(versionInfo.dwMajorVersion), '.', String::number(versionInfo.dwMinorVersion));
-
-    if (!osVersion.length())
-        osVersion = makeString("Windows ", String::number(versionInfo.dwMajorVersion), '.', String::number(versionInfo.dwMinorVersion));
-    return osVersion;
-}
-
-static String webKitVersion()
+static String webKitVersionString()
 {
     LPWSTR buildNumberStringPtr;
     if (!::LoadStringW(gInstance, BUILD_NUMBER, reinterpret_cast<LPWSTR>(&buildNumberStringPtr), 0) || !buildNumberStringPtr)
@@ -2523,15 +2500,15 @@ bool WebView::shouldInitializeTrackPointHack()
         return shouldCreateScrollbars;
 
     hasRunTrackPointCheck = true;
-    const TCHAR trackPointKeys[][50] = { TEXT("Software\\Lenovo\\TrackPoint"),
-        TEXT("Software\\Lenovo\\UltraNav"),
-        TEXT("Software\\Alps\\Apoint\\TrackPoint"),
-        TEXT("Software\\Synaptics\\SynTPEnh\\UltraNavUSB"),
-        TEXT("Software\\Synaptics\\SynTPEnh\\UltraNavPS2") };
+    const WCHAR trackPointKeys[][50] = { L"Software\\Lenovo\\TrackPoint",
+        L"Software\\Lenovo\\UltraNav",
+        L"Software\\Alps\\Apoint\\TrackPoint",
+        L"Software\\Synaptics\\SynTPEnh\\UltraNavUSB",
+        L"Software\\Synaptics\\SynTPEnh\\UltraNavPS2" };
 
     for (int i = 0; i < 5; ++i) {
         HKEY trackPointKey;
-        int readKeyResult = ::RegOpenKeyEx(HKEY_CURRENT_USER, trackPointKeys[i], 0, KEY_READ, &trackPointKey);
+        int readKeyResult = ::RegOpenKeyExW(HKEY_CURRENT_USER, trackPointKeys[i], 0, KEY_READ, &trackPointKey);
         ::RegCloseKey(trackPointKey);
         if (readKeyResult == ERROR_SUCCESS) {
             shouldCreateScrollbars = true;
@@ -2562,8 +2539,8 @@ HRESULT STDMETHODCALLTYPE WebView::initWithFrame(
         // If we detected a registry key belonging to a TrackPoint driver, then create fake trackpoint
         // scrollbars, so the WebView will receive WM_VSCROLL and WM_HSCROLL messages. We create one
         // vertical scrollbar and one horizontal to allow for receiving both types of messages.
-        ::CreateWindow(TEXT("SCROLLBAR"), TEXT("FAKETRACKPOINTHSCROLLBAR"), WS_CHILD | WS_VISIBLE | SBS_HORZ, 0, 0, 0, 0, m_viewWindow, 0, gInstance, 0);
-        ::CreateWindow(TEXT("SCROLLBAR"), TEXT("FAKETRACKPOINTVSCROLLBAR"), WS_CHILD | WS_VISIBLE | SBS_VERT, 0, 0, 0, 0, m_viewWindow, 0, gInstance, 0);
+        ::CreateWindowW(L"SCROLLBAR", L"FAKETRACKPOINTHSCROLLBAR", WS_CHILD | WS_VISIBLE | SBS_HORZ, 0, 0, 0, 0, m_viewWindow, 0, gInstance, 0);
+        ::CreateWindowW(L"SCROLLBAR", L"FAKETRACKPOINTVSCROLLBAR", WS_CHILD | WS_VISIBLE | SBS_VERT, 0, 0, 0, 0, m_viewWindow, 0, gInstance, 0);
     }
 
     hr = registerDragDrop();
@@ -3050,7 +3027,7 @@ HRESULT STDMETHODCALLTYPE WebView::setCustomTextEncodingName(
     if (FAILED(hr))
         return hr;
 
-    if (oldEncoding != encodingName && (!oldEncoding || !encodingName || _tcscmp(oldEncoding, encodingName))) {
+    if (oldEncoding != encodingName && (!oldEncoding || !encodingName || wcscmp(oldEncoding, encodingName))) {
         if (Frame* coreFrame = core(m_mainFrame))
             coreFrame->loader()->reloadWithOverrideEncoding(String(encodingName, SysStringLen(encodingName)));
     }
@@ -5271,7 +5248,7 @@ const IMMDict& IMMDict::dict()
 
 IMMDict::IMMDict()
 {
-    m_instance = ::LoadLibrary(TEXT("IMM32.DLL"));
+    m_instance = ::LoadLibraryW(L"IMM32.DLL");
     getContext = reinterpret_cast<getContextPtr>(::GetProcAddress(m_instance, "ImmGetContext"));
     ASSERT(getContext);
     releaseContext = reinterpret_cast<releaseContextPtr>(::GetProcAddress(m_instance, "ImmReleaseContext"));
@@ -5928,7 +5905,7 @@ bool WebView::onGetObject(WPARAM wParam, LPARAM lParam, LRESULT& lResult) const
         return false;
 
     if (!accessibilityLib) {
-        if (!(accessibilityLib = ::LoadLibrary(TEXT("oleacc.dll"))))
+        if (!(accessibilityLib = ::LoadLibraryW(L"oleacc.dll")))
             return false;
     }