[oilpan] Move IDBDatabase, IDBDatabaseCallbacks, IDBDatabaseBackendInterface and other related clas…

Source/heap/ThreadState.h

Index: Source/heap/ThreadState.h
diff --git a/Source/heap/ThreadState.h b/Source/heap/ThreadState.h
index 839ba991ef6d327187d772df5126ea486219777a..646102339f2a5f26127db32bdf7f63f547530ba5 100644
--- a/Source/heap/ThreadState.h
+++ b/Source/heap/ThreadState.h
@@ -64,17 +64,16 @@ struct ThreadingTrait {
         static const ThreadAffinity Affinity = AnyThread; \
     }
 
-#define REQUIRE_THREADSAFE_HANDLES_NS(Namespace, Class)       \
-    namespace Namespace {                                     \
-        class Class;                                          \
-    }                                                         \
-    namespace WebCore {                                       \
-        template<> struct ThreadingTrait<Namespace::Class> {  \
-            static const ThreadAffinity Affinity = AnyThread; \
-        };                                                    \
+#define REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(Namespace, Class)     \
+    namespace Namespace {                                               \
+        class Class;                                                    \
+    }                                                                   \
+    namespace WebCore {                                                 \
+        template<> struct ThreadingTrait<Namespace::Class> {            \
+            static const ThreadAffinity Affinity = AnyThread;           \
+        };                                                              \
     }
 
-
 template<typename U> class ThreadingTrait<const U> : public ThreadingTrait<U> { };
 
 class HeapObjectHeader;
@@ -325,49 +324,44 @@ public:
 };
 
 // FIXME(oilpan): find a better place for this.
-REQUIRE_THREADSAFE_HANDLES(ScriptExecutionContext);
-REQUIRE_THREADSAFE_HANDLES(Document);
-REQUIRE_THREADSAFE_HANDLES(WorkerContext);
-REQUIRE_THREADSAFE_HANDLES(DedicatedWorkerContext);
-REQUIRE_THREADSAFE_HANDLES(SharedWorkerContext);
-REQUIRE_THREADSAFE_HANDLES(EventTarget);
-REQUIRE_THREADSAFE_HANDLES(MessagePort);
-REQUIRE_THREADSAFE_HANDLES(FileReader);
-REQUIRE_THREADSAFE_HANDLES(FileReaderSync);
-REQUIRE_THREADSAFE_HANDLES(ProgressEvent);
-REQUIRE_THREADSAFE_HANDLES(Event);
-REQUIRE_THREADSAFE_HANDLES(FileError);
-REQUIRE_THREADSAFE_HANDLES(FileException);
-REQUIRE_THREADSAFE_HANDLES(DataView);
-REQUIRE_THREADSAFE_HANDLES(DOMCoreException);
-REQUIRE_THREADSAFE_HANDLES(DOMURL);
-REQUIRE_THREADSAFE_HANDLES(XMLHttpRequest);
-REQUIRE_THREADSAFE_HANDLES(XMLHttpRequestException);
 REQUIRE_THREADSAFE_HANDLES(Blob);
+REQUIRE_THREADSAFE_HANDLES(DOMCoreException);
 REQUIRE_THREADSAFE_HANDLES(DOMFileSystem);
-REQUIRE_THREADSAFE_HANDLES(Entry);
-REQUIRE_THREADSAFE_HANDLES(FileEntry);
-REQUIRE_THREADSAFE_HANDLES(DirectoryEntry);
-REQUIRE_THREADSAFE_HANDLES(DirectoryReder);
 REQUIRE_THREADSAFE_HANDLES(DOMFileSystemSync);
-REQUIRE_THREADSAFE_HANDLES(EntrySync);
-REQUIRE_THREADSAFE_HANDLES(FileEntrySync);
+REQUIRE_THREADSAFE_HANDLES(DOMURL);
+REQUIRE_THREADSAFE_HANDLES(DataView);
+REQUIRE_THREADSAFE_HANDLES(DedicatedWorkerContext);
+REQUIRE_THREADSAFE_HANDLES(DirectoryEntry);
 REQUIRE_THREADSAFE_HANDLES(DirectoryEntrySync);
+REQUIRE_THREADSAFE_HANDLES(DirectoryReder);
 REQUIRE_THREADSAFE_HANDLES(DirectoryRederSync);
+REQUIRE_THREADSAFE_HANDLES(Document);
+REQUIRE_THREADSAFE_HANDLES(Entry);
 REQUIRE_THREADSAFE_HANDLES(EntryArray);
 REQUIRE_THREADSAFE_HANDLES(EntryArraySync);
-REQUIRE_THREADSAFE_HANDLES(FileWriterBase);
+REQUIRE_THREADSAFE_HANDLES(EntrySync);
+REQUIRE_THREADSAFE_HANDLES(Event);
+REQUIRE_THREADSAFE_HANDLES(EventSource);
+REQUIRE_THREADSAFE_HANDLES(EventTarget);
+REQUIRE_THREADSAFE_HANDLES(File);
+REQUIRE_THREADSAFE_HANDLES(FileEntry);
+REQUIRE_THREADSAFE_HANDLES(FileEntrySync);
+REQUIRE_THREADSAFE_HANDLES(FileError);
+REQUIRE_THREADSAFE_HANDLES(FileException);
+REQUIRE_THREADSAFE_HANDLES(FileReader);
+REQUIRE_THREADSAFE_HANDLES(FileReaderSync);
 REQUIRE_THREADSAFE_HANDLES(FileWriter);
+REQUIRE_THREADSAFE_HANDLES(FileWriterBase);
 REQUIRE_THREADSAFE_HANDLES(FileWriterSync);
-REQUIRE_THREADSAFE_HANDLES(File);
-REQUIRE_THREADSAFE_HANDLES(WebSocket);
-REQUIRE_THREADSAFE_HANDLES(EventSource);
-
 REQUIRE_THREADSAFE_HANDLES(IDBAny);
 REQUIRE_THREADSAFE_HANDLES(IDBCallbacks);
 REQUIRE_THREADSAFE_HANDLES(IDBCursor);
 REQUIRE_THREADSAFE_HANDLES(IDBCursorWithValue);
 REQUIRE_THREADSAFE_HANDLES(IDBDatabase);
+REQUIRE_THREADSAFE_HANDLES(IDBDatabaseBackendImpl);
+REQUIRE_THREADSAFE_HANDLES(IDBDatabaseBackendInterface);
+REQUIRE_THREADSAFE_HANDLES(IDBDatabaseCallbacks);
+REQUIRE_THREADSAFE_HANDLES(IDBDatabaseCallbacksImpl);
 REQUIRE_THREADSAFE_HANDLES(IDBFactory);
 REQUIRE_THREADSAFE_HANDLES(IDBFactoryBackendImpl);
 REQUIRE_THREADSAFE_HANDLES(IDBFactoryBackendInterface);
@@ -375,22 +369,34 @@ REQUIRE_THREADSAFE_HANDLES(IDBIndex);
 REQUIRE_THREADSAFE_HANDLES(IDBKeyRange);
 REQUIRE_THREADSAFE_HANDLES(IDBObjectStore);
 REQUIRE_THREADSAFE_HANDLES(IDBOpenDBRequest);
+REQUIRE_THREADSAFE_HANDLES(IDBRequest);
 REQUIRE_THREADSAFE_HANDLES(IDBTransaction);
 REQUIRE_THREADSAFE_HANDLES(IDBVersionChangeEvent);
-REQUIRE_THREADSAFE_HANDLES(IDBRequest);
+REQUIRE_THREADSAFE_HANDLES(MessagePort);
+REQUIRE_THREADSAFE_HANDLES(ProgressEvent);
+REQUIRE_THREADSAFE_HANDLES(ScriptExecutionContext);
+REQUIRE_THREADSAFE_HANDLES(SharedWorkerContext);
+REQUIRE_THREADSAFE_HANDLES(WebSocket);
+REQUIRE_THREADSAFE_HANDLES(WorkerContext);
+REQUIRE_THREADSAFE_HANDLES(XMLHttpRequest);
+REQUIRE_THREADSAFE_HANDLES(XMLHttpRequestException);
 
 }
 
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, ArrayBuffer);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, ArrayBufferView);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Int8Array);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Uint8ClampedArray);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Uint8Array);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Int16Array);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Uint16Array);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Int32Array);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Uint32Array);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Float32Array);
-REQUIRE_THREADSAFE_HANDLES_NS(WTF, Float64Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, ArrayBuffer);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, ArrayBufferView);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Int8Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Uint8ClampedArray);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Uint8Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Int16Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Uint16Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Int32Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Uint32Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Float32Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WTF, Float64Array);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WebKit, IDBCallbacksProxy);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WebKit, IDBDatabaseBackendProxy);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WebKit, IDBDatabaseCallbacksProxy);
+REQUIRE_THREADSAFE_HANDLES_WITH_NAMESPACE(WebKit, IDBFactoryBackendProxy);
 
 #endif