Diff
Modified: trunk/Source/WTF/ChangeLog (141949 => 141950)
--- trunk/Source/WTF/ChangeLog 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WTF/ChangeLog 2013-02-06 00:58:47 UTC (rev 141950)
@@ -1,3 +1,12 @@
+2013-02-05 Mark Lam <[email protected]>
+
+ Rename ENUM_CLASS_BEGIN() macro to ENUM_CLASS(), and make DatabaseType a strong enum.
+ https://bugs.webkit.org/show_bug.cgi?id=108988.
+
+ Reviewed by Alexey Proskuryakov.
+
+ * wtf/EnumClass.h:
+
2013-02-05 Roger Fong <[email protected]>
Unreviewed build fix.
Modified: trunk/Source/WTF/wtf/EnumClass.h (141949 => 141950)
--- trunk/Source/WTF/wtf/EnumClass.h 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WTF/wtf/EnumClass.h 2013-02-06 00:58:47 UTC (rev 141950)
@@ -43,7 +43,7 @@
//
// ... write this:
//
-// ENUM_CLASS_BEGIN(MyEnums) {
+// ENUM_CLASS(MyEnums) {
// Value1,
// Value2,
// ...
@@ -54,7 +54,7 @@
// Otherwise, it will use the EnumClass template below.
#if COMPILER_SUPPORTS(CXX_STRONG_ENUMS)
-#define ENUM_CLASS_BEGIN(__enumName) \
+#define ENUM_CLASS(__enumName) \
enum class __enumName
#define ENUM_CLASS_END(__enumName)
@@ -104,7 +104,7 @@
Value m_value;
};
-#define ENUM_CLASS_BEGIN(__enumName) \
+#define ENUM_CLASS(__enumName) \
struct __enumName ## Definition { \
enum Enums
Modified: trunk/Source/WebCore/ChangeLog (141949 => 141950)
--- trunk/Source/WebCore/ChangeLog 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WebCore/ChangeLog 2013-02-06 00:58:47 UTC (rev 141950)
@@ -1,3 +1,25 @@
+2013-02-05 Mark Lam <[email protected]>
+
+ Rename ENUM_CLASS_BEGIN() macro to ENUM_CLASS(), and make DatabaseType a strong enum.
+ https://bugs.webkit.org/show_bug.cgi?id=108988.
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests.
+
+ * Modules/webdatabase/DatabaseBackend.cpp:
+ (WebCore::DatabaseBackend::DatabaseBackend):
+ * Modules/webdatabase/DatabaseBackend.h:
+ (DatabaseBackend):
+ * Modules/webdatabase/DatabaseBackendAsync.cpp:
+ (WebCore::DatabaseBackendAsync::DatabaseBackendAsync):
+ * Modules/webdatabase/DatabaseBackendSync.cpp:
+ (WebCore::DatabaseBackendSync::DatabaseBackendSync):
+ * Modules/webdatabase/DatabaseBasicTypes.h:
+ (WebCore::ENUM_CLASS):
+ * Modules/webdatabase/DatabaseError.h:
+ (WebCore::ENUM_CLASS):
+
2013-02-05 Kentaro Hara <[email protected]>
[V8] Remove deprecatedV8String() and deprecatedV8Integer()
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp (141949 => 141950)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp 2013-02-06 00:58:47 UTC (rev 141950)
@@ -215,7 +215,7 @@
, m_guid(0)
, m_opened(false)
, m_new(false)
- , m_isSyncDatabase(databaseType == SyncDatabase)
+ , m_isSyncDatabase(databaseType == DatabaseType::Sync)
{
m_contextThreadSecurityOrigin = m_databaseContext->securityOrigin()->isolatedCopy();
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h (141949 => 141950)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h 2013-02-06 00:58:47 UTC (rev 141950)
@@ -98,11 +98,6 @@
friend class SQLTransactionSync;
friend class SQLTransaction;
- enum DatabaseType {
- AsyncDatabase,
- SyncDatabase
- };
-
DatabaseBackend(PassRefPtr<DatabaseBackendContext>, const String& name, const String& expectedVersion,
const String& displayName, unsigned long estimatedSize, DatabaseType);
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendAsync.cpp (141949 => 141950)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendAsync.cpp 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendAsync.cpp 2013-02-06 00:58:47 UTC (rev 141950)
@@ -33,7 +33,7 @@
namespace WebCore {
DatabaseBackendAsync::DatabaseBackendAsync(PassRefPtr<DatabaseBackendContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
- : DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, AsyncDatabase)
+ : DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, DatabaseType::Async)
{
}
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.cpp (141949 => 141950)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.cpp 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendSync.cpp 2013-02-06 00:58:47 UTC (rev 141950)
@@ -33,7 +33,7 @@
namespace WebCore {
DatabaseBackendSync::DatabaseBackendSync(PassRefPtr<DatabaseBackendContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
- : DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, SyncDatabase)
+ : DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, DatabaseType::Sync)
{
}
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h (141949 => 141950)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h 2013-02-06 00:58:47 UTC (rev 141950)
@@ -28,11 +28,18 @@
#if ENABLE(SQL_DATABASE)
+#include <wtf/EnumClass.h>
+
namespace WebCore {
typedef int DatabaseGuid;
typedef int ExceptionCode;
+ENUM_CLASS(DatabaseType) {
+ Async,
+ Sync
+} ENUM_CLASS_END(DatabaseType);
+
} // namespace WebCore
#endif // ENABLE(SQL_DATABASE)
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h (141949 => 141950)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h 2013-02-06 00:48:52 UTC (rev 141949)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseError.h 2013-02-06 00:58:47 UTC (rev 141950)
@@ -32,7 +32,7 @@
namespace WebCore {
-ENUM_CLASS_BEGIN(DatabaseError) {
+ENUM_CLASS(DatabaseError) {
None = 0,
CannotOpenDatabase,
DatabaseIsBeingDeleted,
