Diff
Modified: trunk/Source/WTF/ChangeLog (160686 => 160687)
--- trunk/Source/WTF/ChangeLog 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WTF/ChangeLog 2013-12-17 02:27:01 UTC (rev 160687)
@@ -1,3 +1,18 @@
+2013-12-16 Anders Carlsson <[email protected]>
+
+ Remove EnumClass.h from WTF
+ https://bugs.webkit.org/show_bug.cgi?id=125820
+
+ Reviewed by Darin Adler.
+
+ All compilers we build on now support real strongly typed enums, so we can remove the ENUM_CLASS version.
+
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.vcxproj/WTF.vcxproj.filters:
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/CheckedArithmetic.h:
+ * wtf/EnumClass.h: Removed.
+
2013-12-16 Brent Fulgham <[email protected]>
[Win] Remove dead code after conversion to VS2013
Modified: trunk/Source/WTF/GNUmakefile.list.am (160686 => 160687)
--- trunk/Source/WTF/GNUmakefile.list.am 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WTF/GNUmakefile.list.am 2013-12-17 02:27:01 UTC (rev 160687)
@@ -45,7 +45,6 @@
Source/WTF/wtf/DynamicAnnotations.cpp \
Source/WTF/wtf/DynamicAnnotations.h \
Source/WTF/wtf/Encoder.h \
- Source/WTF/wtf/EnumClass.h \
Source/WTF/wtf/ExportMacros.h \
Source/WTF/wtf/FastBitVector.cpp \
Source/WTF/wtf/FastBitVector.h \
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (160686 => 160687)
--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-12-17 02:27:01 UTC (rev 160687)
@@ -193,7 +193,6 @@
<ClInclude Include="..\wtf\dtoa\utils.h" />
<ClInclude Include="..\wtf\DynamicAnnotations.h" />
<ClInclude Include="..\wtf\Encoder.h" />
- <ClInclude Include="..\wtf\EnumClass.h" />
<ClInclude Include="..\wtf\FastBitVector.h" />
<ClInclude Include="..\wtf\FastMalloc.h" />
<ClInclude Include="..\wtf\FeatureDefines.h" />
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (160686 => 160687)
--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2013-12-17 02:27:01 UTC (rev 160687)
@@ -423,9 +423,6 @@
<ClInclude Include="..\wtf\Encoder.h">
<Filter>wtf</Filter>
</ClInclude>
- <ClInclude Include="..\wtf\EnumClass.h">
- <Filter>wtf</Filter>
- </ClInclude>
<ClInclude Include="..\wtf\FastBitVector.h">
<Filter>wtf</Filter>
</ClInclude>
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (160686 => 160687)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2013-12-17 02:27:01 UTC (rev 160687)
@@ -64,7 +64,6 @@
2CDED0EF18115C38004DBA70 /* RunLoopCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CDED0EE18115C38004DBA70 /* RunLoopCF.cpp */; };
2CDED0F318115C85004DBA70 /* RunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CDED0F118115C85004DBA70 /* RunLoop.cpp */; };
2CDED0F418115C85004DBA70 /* RunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CDED0F218115C85004DBA70 /* RunLoop.h */; };
- 44F66008171AFAE600E4AD19 /* EnumClass.h in Headers */ = {isa = PBXBuildFile; fileRef = 44F66007171AFAA900E4AD19 /* EnumClass.h */; };
7E29C33E15FFD79B00516D61 /* ObjcRuntimeExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */; };
8134013815B092FD001FF0B8 /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8134013615B092FD001FF0B8 /* Base64.cpp */; };
8134013915B092FD001FF0B8 /* Base64.h in Headers */ = {isa = PBXBuildFile; fileRef = 8134013715B092FD001FF0B8 /* Base64.h */; };
@@ -331,7 +330,6 @@
2CDED0F118115C85004DBA70 /* RunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoop.cpp; sourceTree = "<group>"; };
2CDED0F218115C85004DBA70 /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
44DEE74A152274BB00C6EC37 /* iOS.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = iOS.xcconfig; sourceTree = "<group>"; };
- 44F66007171AFAA900E4AD19 /* EnumClass.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EnumClass.h; sourceTree = "<group>"; };
5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
@@ -690,7 +688,6 @@
A8A47299151A825A004123FF /* DynamicAnnotations.cpp */,
A8A4729A151A825A004123FF /* DynamicAnnotations.h */,
A8A4729E151A825A004123FF /* Encoder.h */,
- 44F66007171AFAA900E4AD19 /* EnumClass.h */,
A8A4729F151A825A004123FF /* ExportMacros.h */,
0F885E0E1845AE9F00F1E3FA /* FastBitVector.cpp */,
0FD81AC4154FB22E00983E72 /* FastBitVector.h */,
@@ -996,7 +993,6 @@
A8A473BB151A825B004123FF /* dtoa.h in Headers */,
A8A473BD151A825B004123FF /* DynamicAnnotations.h in Headers */,
A8A473C0151A825B004123FF /* Encoder.h in Headers */,
- 44F66008171AFAE600E4AD19 /* EnumClass.h in Headers */,
A8A473C1151A825B004123FF /* ExportMacros.h in Headers */,
A8A473B4151A825B004123FF /* fast-dtoa.h in Headers */,
0FD81AC5154FB22E00983E72 /* FastBitVector.h in Headers */,
Modified: trunk/Source/WTF/wtf/CheckedArithmetic.h (160686 => 160687)
--- trunk/Source/WTF/wtf/CheckedArithmetic.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WTF/wtf/CheckedArithmetic.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -27,7 +27,6 @@
#define CheckedArithmetic_h
#include <wtf/Assertions.h>
-#include <wtf/EnumClass.h>
#include <limits>
#include <stdint.h>
@@ -67,12 +66,11 @@
namespace WTF {
-ENUM_CLASS(CheckedState)
-{
+enum class CheckedState {
DidOverflow,
DidNotOverflow
-} ENUM_CLASS_END(CheckedState);
-
+};
+
class CrashOnOverflow {
public:
static NO_RETURN_DUE_TO_CRASH void overflowed()
Deleted: trunk/Source/WTF/wtf/EnumClass.h (160686 => 160687)
--- trunk/Source/WTF/wtf/EnumClass.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WTF/wtf/EnumClass.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -1,134 +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_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(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(__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; }
-
- ALWAYS_INLINE bool operator==(const Value value) { return m_value == value; }
- ALWAYS_INLINE bool operator!=(const Value value) { return m_value != value; }
- ALWAYS_INLINE bool operator<(const Value value) { return m_value < value; }
- ALWAYS_INLINE bool operator<=(const Value value) { return m_value <= value; }
- ALWAYS_INLINE bool operator>(const Value value) { return m_value > value; }
- ALWAYS_INLINE bool operator>=(const Value value) { return m_value >= value; }
-
- ALWAYS_INLINE operator Value() { return m_value; }
-
-private:
- Value m_value;
-};
-
-#define ENUM_CLASS(__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
Modified: trunk/Source/WebCore/ChangeLog (160686 => 160687)
--- trunk/Source/WebCore/ChangeLog 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/ChangeLog 2013-12-17 02:27:01 UTC (rev 160687)
@@ -1,3 +1,25 @@
+2013-12-16 Anders Carlsson <[email protected]>
+
+ Remove EnumClass.h from WTF
+ https://bugs.webkit.org/show_bug.cgi?id=125820
+
+ Reviewed by Darin Adler.
+
+ Replace uses of ENUM_CLASS with real enum class declarations.
+
+ * Modules/webdatabase/DatabaseBasicTypes.h:
+ * Modules/webdatabase/DatabaseError.h:
+ * Modules/webdatabase/SQLTransactionState.h:
+ * bindings/js/JSSubtleCryptoCustom.cpp:
+ * bindings/js/SerializedScriptValue.cpp:
+ * crypto/CryptoAlgorithmIdentifier.h:
+ * crypto/CryptoAlgorithmParameters.h:
+ * crypto/CryptoKey.h:
+ * crypto/CryptoKeyData.h:
+ * crypto/CryptoKeyType.h:
+ * crypto/keys/CryptoKeyDataRSAComponents.h:
+ * inspector/InspectorTimelineAgent.h:
+
2013-12-16 Tim Horton <[email protected]>
WebKit2 View Gestures: Pinching beyond the extremes doesn't animate back to the min/max
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h (160686 => 160687)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -28,17 +28,15 @@
#if ENABLE(SQL_DATABASE)
-#include <wtf/EnumClass.h>
-
namespace WebCore {
typedef int DatabaseGuid;
typedef int ExceptionCode;
-ENUM_CLASS(DatabaseType) {
+enum class DatabaseType {
Async,
Sync
-} ENUM_CLASS_END(DatabaseType);
+};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h (160686 => 160687)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -28,18 +28,16 @@
#if ENABLE(SQL_DATABASE)
-#include <wtf/EnumClass.h>
-
namespace WebCore {
-ENUM_CLASS(DatabaseError) {
+enum class DatabaseError {
None = 0,
DatabaseIsBeingDeleted,
DatabaseSizeExceededQuota,
DatabaseSizeOverflowed,
GenericSecurityError,
InvalidDatabaseState
-} ENUM_CLASS_END(DatabaseError);
+};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/webdatabase/SQLTransactionState.h (160686 => 160687)
--- trunk/Source/WebCore/Modules/webdatabase/SQLTransactionState.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/Modules/webdatabase/SQLTransactionState.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -28,11 +28,9 @@
#if ENABLE(SQL_DATABASE)
-#include <wtf/EnumClass.h>
-
namespace WebCore {
-ENUM_CLASS(SQLTransactionState) {
+enum class SQLTransactionState {
End = 0,
Idle,
AcquireLock,
@@ -47,7 +45,7 @@
DeliverQuotaIncreaseCallback,
DeliverSuccessCallback,
NumberOfStates // Always keep this at the end of the list.
-} ENUM_CLASS_END(SQLTransactionState);
+};
} // namespace WebCore
Modified: trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp (160686 => 160687)
--- trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/bindings/js/JSSubtleCryptoCustom.cpp 2013-12-17 02:27:01 UTC (rev 160687)
@@ -45,7 +45,7 @@
namespace WebCore {
-ENUM_CLASS(CryptoKeyFormat) {
+enum class CryptoKeyFormat {
// An unformatted sequence of bytes. Intended for secret keys.
Raw,
Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (160686 => 160687)
--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2013-12-17 02:27:01 UTC (rev 160687)
@@ -166,20 +166,20 @@
#if ENABLE(SUBTLE_CRYPTO)
-ENUM_CLASS(CryptoKeyClassSubtag) {
+enum class CryptoKeyClassSubtag {
HMAC = 0,
AES = 1,
RSA = 2
};
const uint8_t cryptoKeyClassSubtagMaximumValue = 2;
-ENUM_CLASS(CryptoKeyAsymmetricTypeSubtag) {
+enum class CryptoKeyAsymmetricTypeSubtag {
Public = 0,
Private = 1
};
const uint8_t cryptoKeyAsymmetricTypeSubtagMaximumValue = 1;
-ENUM_CLASS(CryptoKeyUsageTag) {
+enum class CryptoKeyUsageTag {
Encrypt = 0,
Decrypt = 1,
Sign = 2,
@@ -191,7 +191,7 @@
};
const uint8_t cryptoKeyUsageTagMaximumValue = 7;
-ENUM_CLASS(CryptoAlgorithmIdentifierTag) {
+enum class CryptoAlgorithmIdentifierTag {
RSAES_PKCS1_v1_5 = 0,
RSASSA_PKCS1_v1_5 = 1,
RSA_PSS = 2,
Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmIdentifier.h (160686 => 160687)
--- trunk/Source/WebCore/crypto/CryptoAlgorithmIdentifier.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmIdentifier.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -30,7 +30,7 @@
namespace WebCore {
-ENUM_CLASS(CryptoAlgorithmIdentifier) {
+enum class CryptoAlgorithmIdentifier {
RSAES_PKCS1_v1_5 = 1,
RSASSA_PKCS1_v1_5,
RSA_PSS,
Modified: trunk/Source/WebCore/crypto/CryptoAlgorithmParameters.h (160686 => 160687)
--- trunk/Source/WebCore/crypto/CryptoAlgorithmParameters.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/crypto/CryptoAlgorithmParameters.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -38,7 +38,7 @@
CryptoAlgorithmParameters() { }
virtual ~CryptoAlgorithmParameters() { }
- ENUM_CLASS(Class) {
+ enum class Class {
None,
AesCbcParams,
AesKeyGenParams,
Modified: trunk/Source/WebCore/crypto/CryptoKey.h (160686 => 160687)
--- trunk/Source/WebCore/crypto/CryptoKey.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/crypto/CryptoKey.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -40,7 +40,7 @@
class CryptoAlgorithmDescriptionBuilder;
class CryptoKeyData;
-ENUM_CLASS(CryptoKeyClass) {
+enum class CryptoKeyClass {
HMAC,
AES,
RSA
Modified: trunk/Source/WebCore/crypto/CryptoKeyData.h (160686 => 160687)
--- trunk/Source/WebCore/crypto/CryptoKeyData.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/crypto/CryptoKeyData.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -35,7 +35,7 @@
class CryptoKeyData {
WTF_MAKE_NONCOPYABLE(CryptoKeyData);
public:
- ENUM_CLASS(Format) {
+ enum class Format {
OctetSequence,
RSAComponents
};
Modified: trunk/Source/WebCore/crypto/CryptoKeyType.h (160686 => 160687)
--- trunk/Source/WebCore/crypto/CryptoKeyType.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/crypto/CryptoKeyType.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -30,7 +30,7 @@
namespace WebCore {
-ENUM_CLASS(CryptoKeyType) {
+enum class CryptoKeyType {
Secret,
Public,
Private
Modified: trunk/Source/WebCore/crypto/keys/CryptoKeyDataRSAComponents.h (160686 => 160687)
--- trunk/Source/WebCore/crypto/keys/CryptoKeyDataRSAComponents.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/crypto/keys/CryptoKeyDataRSAComponents.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -35,7 +35,7 @@
class CryptoKeyDataRSAComponents FINAL : public CryptoKeyData {
public:
- ENUM_CLASS(Type) {
+ enum class Type {
Public,
Private
};
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (160686 => 160687)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2013-12-17 02:16:07 UTC (rev 160686)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2013-12-17 02:27:01 UTC (rev 160687)
@@ -60,7 +60,7 @@
typedef String ErrorString;
-ENUM_CLASS(TimelineRecordType) {
+enum class TimelineRecordType {
EventDispatch,
BeginFrame,
ScheduleStyleRecalculation,
@@ -106,7 +106,7 @@
WebSocketSendHandshakeRequest,
WebSocketReceiveHandshakeResponse,
WebSocketDestroy
-} ENUM_CLASS_END(TimelineRecordType);
+};
class TimelineTimeConverter {
public:
