Code drop from //branches/cupcake/...@124589

1 files changed, 18 insertions, 61 deletions

diff --git a/WebKit/win/COMEnumVariant.h b/WebKit/win/COMEnumVariant.h
index be0ac8c..98b770d 100644
--- a/WebKit/win/COMEnumVariant.h
+++ b/WebKit/win/COMEnumVariant.h
@@ -1,29 +1,26 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * 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.
  *
- * 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 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 COMEnumVariant_h
@@ -32,49 +29,9 @@
 #define NOMINMAX
 #include <unknwn.h>
 
-#include <WebCore/BString.h>
-#include <wtf/Assertions.h>
 #include <wtf/Noncopyable.h>
 
-namespace WebCore {
-    class String;
-}
-
-template<typename T> struct COMVariantSetter {};
-
-template<> struct COMVariantSetter<WebCore::String>
-{
-    static void setVariant(VARIANT* variant, const WebCore::String& value)
-    {
-        ASSERT(V_VT(variant) == VT_EMPTY);
-
-        V_VT(variant) = VT_BSTR;
-        V_BSTR(variant) = WebCore::BString(value).release();
-    }
-};
-
-template<> struct COMVariantSetter<unsigned long long>
-{
-    static void setVariant(VARIANT* variant, unsigned long long value)
-    {
-        ASSERT(V_VT(variant) == VT_EMPTY);
-
-        V_VT(variant) = VT_UI8;
-        V_UI8(variant) = value;
-    }
-};
-
-template<typename COMType, typename UnderlyingType>
-struct COMIUnknownVariantSetter
-{
-    static void setVariant(VARIANT* variant, const UnderlyingType& value)
-    {
-        ASSERT(V_VT(variant) == VT_EMPTY);
-
-        V_VT(variant) = VT_UNKNOWN;
-        V_UNKNOWN(variant) = COMType::createInstance(value);
-    }
-};
+#include "COMVariantSetter.h"
 
 template<typename ContainerType>
 class COMEnumVariant : public IEnumVARIANT, Noncopyable {