Diff
Modified: trunk/Source/WTF/ChangeLog (141498 => 141499)
--- trunk/Source/WTF/ChangeLog 2013-01-31 23:46:03 UTC (rev 141498)
+++ trunk/Source/WTF/ChangeLog 2013-01-31 23:49:26 UTC (rev 141499)
@@ -1,3 +1,21 @@
+2013-01-31 Mark Lam <[email protected]>
+
+ Abstraction for hiding enum class.
+ https://bugs.webkit.org/show_bug.cgi?id=108533
+
+ Reviewed by Anders Carlsson.
+
+ * wtf/Compiler.h:
+ * wtf/EnumClass.h: Copied from Source/WTF/wtf/TypeSafeEnum.h.
+ (WTF::EnumClass::EnumClass):
+ (WTF::EnumClass::operator==):
+ (WTF::EnumClass::operator!=):
+ (WTF::EnumClass::operator<):
+ (WTF::EnumClass::operator<=):
+ (WTF::EnumClass::operator>):
+ (WTF::EnumClass::operator>=):
+ * wtf/TypeSafeEnum.h: Removed.
+
2013-01-31 Andreas Kling <[email protected]>
Vector should consult allocator about ideal size when choosing capacity.
Modified: trunk/Source/WTF/wtf/Compiler.h (141498 => 141499)
--- trunk/Source/WTF/wtf/Compiler.h 2013-01-31 23:46:03 UTC (rev 141498)
+++ trunk/Source/WTF/wtf/Compiler.h 2013-01-31 23:49:26 UTC (rev 141499)
@@ -62,6 +62,7 @@
#define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT __has_extension(c_static_assert)
#define WTF_COMPILER_SUPPORTS_CXX_OVERRIDE_CONTROL __has_extension(cxx_override_control)
#define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_extension(has_trivial_destructor)
+#define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_extension(cxx_strong_enums)
#endif
Copied: trunk/Source/WTF/wtf/EnumClass.h (from rev 141439, trunk/Source/WTF/wtf/TypeSafeEnum.h) (0 => 141499)
--- trunk/Source/WTF/wtf/EnumClass.h (rev 0)
+++ trunk/Source/WTF/wtf/EnumClass.h 2013-01-31 23:49:26 UTC (rev 141499)
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2013 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 WTF_EnumClass_h
+#define WTF_EnumClass_h
+
+#include <wtf/Compiler.h>
+
+namespace WTF {
+
+// How to define a type safe enum list using the ENUM_CLASS macros?
+// ===============================================================
+// To get an enum list like this:
+//
+// enum class MyEnums {
+// Value1,
+// Value2,
+// ...
+// ValueN
+// };
+//
+// ... write this:
+//
+// ENUM_CLASS_BEGIN(MyEnums) {
+// Value1,
+// Value2,
+// ...
+// ValueN
+// } ENUM_CLASS_END(MyEnums);
+//
+// The ENUM_CLASS macros will use C++11's enum class if the compiler supports it.
+// Otherwise, it will use the EnumClass template below.
+
+#if COMPILER_SUPPORTS(CXX_STRONG_ENUMS)
+#define ENUM_CLASS_BEGIN(__enumName) \
+ enum class __enumName
+
+#define ENUM_CLASS_END(__enumName)
+
+#else // !COMPILER_SUPPORTS(CXX_STRONG_ENUMS)
+
+// How to define a type safe enum list using the EnumClass template?
+// ================================================================
+// Definition should be a struct that encapsulates an enum list.
+// The enum list should be names Enums.
+//
+// Here's an example of how to define a type safe enum named MyEnum using
+// the EnumClass template:
+//
+// struct MyEnumDefinition {
+// enum Enums {
+// ValueDefault,
+// Value1,
+// ...
+// ValueN
+// };
+// };
+// typedef EnumClass<MyEnumDefinition, MyEnumDefinition::ValueDefault> MyEnum;
+//
+// With that, you can now use MyEnum enum values as follow:
+//
+// MyEnum value1; // value1 is assigned MyEnum::ValueDefault by default.
+// MyEnum value2 = MyEnum::Value1; // value2 is assigned MyEnum::Value1;
+
+template <typename Definition>
+class EnumClass : public Definition {
+ typedef enum Definition::Enums Value;
+public:
+ ALWAYS_INLINE EnumClass() { }
+ ALWAYS_INLINE EnumClass(Value value) : m_value(value) { }
+
+ ALWAYS_INLINE Value value() const { return m_value; }
+
+ ALWAYS_INLINE bool operator==(const EnumClass other) { return m_value == other.m_value; }
+ ALWAYS_INLINE bool operator!=(const EnumClass other) { return m_value != other.m_value; }
+ ALWAYS_INLINE bool operator<(const EnumClass other) { return m_value < other.m_value; }
+ ALWAYS_INLINE bool operator<=(const EnumClass other) { return m_value <= other.m_value; }
+ ALWAYS_INLINE bool operator>(const EnumClass other) { return m_value > other.m_value; }
+ ALWAYS_INLINE bool operator>=(const EnumClass other) { return m_value >= other.m_value; }
+
+private:
+ Value m_value;
+};
+
+#define ENUM_CLASS_BEGIN(__enumName) \
+ struct __enumName ## Definition { \
+ enum Enums
+
+#define ENUM_CLASS_END(__enumName) \
+ ; \
+ }; \
+ typedef EnumClass< __enumName ## Definition > __enumName
+
+#endif // !COMPILER_SUPPORTS(CXX_STRONG_ENUMS)
+
+} // namespace WTF
+
+#if !COMPILER_SUPPORTS(CXX_STRONG_ENUMS)
+using WTF::EnumClass;
+#endif
+
+#endif // WTF_EnumClass_h
Deleted: trunk/Source/WTF/wtf/TypeSafeEnum.h (141498 => 141499)
--- trunk/Source/WTF/wtf/TypeSafeEnum.h 2013-01-31 23:46:03 UTC (rev 141498)
+++ trunk/Source/WTF/wtf/TypeSafeEnum.h 2013-01-31 23:49:26 UTC (rev 141499)
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2013 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 WTF_TypeSafeEnum_h
-#define WTF_TypeSafeEnum_h
-
-namespace WTF {
-
-// How to define a type safe enum list using TypeSafeEnum?
-// ======================================================
-// Definition should be a struct that encapsulates an enum list.
-// The enum list should be names Enums.
-//
-// Here's an example of how to define a type safe enum named MyEnum using
-// the TypeSafeEnum template:
-//
-// struct MyEnumDefinition {
-// enum Enums {
-// ValueDefault,
-// Value1,
-// ...
-// ValueN
-// };
-// };
-// typedef TypeSafeEnum<MyEnumDefinition, MyEnumDefinition::ValueDefault> MyEnum;
-//
-// With that, you can now use MyEnum enum values as follow:
-//
-// MyEnum value1; // value1 is assigned MyEnum::ValueDefault by default.
-// MyEnum value2 = MyEnum::Value1; // value2 is assigned MyEnum::Value1;
-
-template <typename Definition, typename Definition::Enums defaultValue>
-class TypeSafeEnum : public Definition {
- typedef enum Definition::Enums Value;
-public:
- ALWAYS_INLINE TypeSafeEnum() : m_value(defaultValue) { }
- ALWAYS_INLINE TypeSafeEnum(Value value) : m_value(value) { }
-
- ALWAYS_INLINE Value value() const { return m_value; }
-
- ALWAYS_INLINE bool operator==(const TypeSafeEnum other) { return m_value == other.m_value; }
- ALWAYS_INLINE bool operator!=(const TypeSafeEnum other) { return m_value != other.m_value; }
- ALWAYS_INLINE bool operator<(const TypeSafeEnum other) { return m_value < other.m_value; }
- ALWAYS_INLINE bool operator<=(const TypeSafeEnum other) { return m_value <= other.m_value; }
- ALWAYS_INLINE bool operator>(const TypeSafeEnum other) { return m_value > other.m_value; }
- ALWAYS_INLINE bool operator>=(const TypeSafeEnum other) { return m_value >= other.m_value; }
-
-private:
- Value m_value;
-};
-
-} // namespace WTF
-
-using WTF::TypeSafeEnum;
-
-#endif // WTF_TypeSafeEnum_h
Modified: trunk/Source/WebCore/ChangeLog (141498 => 141499)
--- trunk/Source/WebCore/ChangeLog 2013-01-31 23:46:03 UTC (rev 141498)
+++ trunk/Source/WebCore/ChangeLog 2013-01-31 23:49:26 UTC (rev 141499)
@@ -1,3 +1,15 @@
+2013-01-31 Mark Lam <[email protected]>
+
+ Abstraction for hiding enum class.
+ https://bugs.webkit.org/show_bug.cgi?id=108533
+
+ Reviewed by Anders Carlsson.
+
+ No new tests.
+
+ * Modules/webdatabase/DatabaseError.h:
+ (WebCore::ENUM_CLASS_BEGIN):
+
2013-01-31 Arnaud Renevier <[email protected]>
[Gtk] drag and drop has black background without composition
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h (141498 => 141499)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h 2013-01-31 23:46:03 UTC (rev 141498)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h 2013-01-31 23:49:26 UTC (rev 141499)
@@ -28,22 +28,18 @@
#if ENABLE(SQL_DATABASE)
-#include <wtf/TypeSafeEnum.h>
+#include <wtf/EnumClass.h>
namespace WebCore {
-struct DatabaseErrorDefinition {
- enum Enums {
- None = 0,
- CannotOpenDatabase,
- DatabaseIsBeingDeleted,
- DatabaseSizeExceededQuota,
- DatabaseSizeOverflowed
- };
-};
+ENUM_CLASS_BEGIN(DatabaseError) {
+ None = 0,
+ CannotOpenDatabase,
+ DatabaseIsBeingDeleted,
+ DatabaseSizeExceededQuota,
+ DatabaseSizeOverflowed
+} ENUM_CLASS_END(DatabaseError);
-typedef TypeSafeEnum<DatabaseErrorDefinition, DatabaseErrorDefinition::None> DatabaseError;
-
} // namespace WebCore
#endif // ENABLE(SQL_DATABASE)
