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

Source/WebKit/chromium/src/IDBCallbacksProxy.h

Index: Source/WebKit/chromium/src/IDBCallbacksProxy.h
diff --git a/Source/WebKit/chromium/src/IDBCallbacksProxy.h b/Source/WebKit/chromium/src/IDBCallbacksProxy.h
index 5aaf130b2ecb855ecc13de34f0827eadb1bd42fe..afa024b37b643e493ee8f21b325545828f93a4ad 100644
--- a/Source/WebKit/chromium/src/IDBCallbacksProxy.h
+++ b/Source/WebKit/chromium/src/IDBCallbacksProxy.h
@@ -41,13 +41,13 @@ class IDBDatabaseCallbacksProxy;
 
 class IDBCallbacksProxy : public WebCore::IDBCallbacks {
 public:
-    static PassRefPtr<IDBCallbacksProxy> create(PassOwnPtr<WebIDBCallbacks>);
+    static IDBCallbacksProxy* create(PassOwnPtr<WebIDBCallbacks>);
     virtual ~IDBCallbacksProxy();
 
     virtual void onError(PassRefPtr<WebCore::IDBDatabaseError>);
     virtual void onSuccess(const Vector<String>&);
     virtual void onSuccess(PassRefPtr<WebCore::IDBCursorBackendInterface>, PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey> primaryKey, PassRefPtr<WebCore::SharedBuffer>);
-    virtual void onSuccess(PassRefPtr<WebCore::IDBDatabaseBackendInterface>, const WebCore::IDBDatabaseMetadata&);
+    virtual void onSuccess(WebCore::IDBDatabaseBackendInterface*, const WebCore::IDBDatabaseMetadata&);
     virtual void onSuccess(PassRefPtr<WebCore::IDBKey>);
     virtual void onSuccess(PassRefPtr<WebCore::SharedBuffer>);
     virtual void onSuccess(PassRefPtr<WebCore::SharedBuffer>, PassRefPtr<WebCore::IDBKey>, const WebCore::IDBKeyPath&);
@@ -56,15 +56,15 @@ public:
     virtual void onSuccess(PassRefPtr<WebCore::IDBKey>, PassRefPtr<WebCore::IDBKey> primaryKey, PassRefPtr<WebCore::SharedBuffer>);
     virtual void onSuccessWithPrefetch(const Vector<RefPtr<WebCore::IDBKey> >& keys, const Vector<RefPtr<WebCore::IDBKey> >& primaryKeys, const Vector<RefPtr<WebCore::SharedBuffer> >& values);
     virtual void onBlocked(int64_t existingVersion);
-    virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<WebCore::IDBDatabaseBackendInterface>, const WebCore::IDBDatabaseMetadata&);
+    virtual void onUpgradeNeeded(int64_t oldVersion, WebCore::IDBDatabaseBackendInterface*, const WebCore::IDBDatabaseMetadata&);
 
-    void setDatabaseCallbacks(PassRefPtr<IDBDatabaseCallbacksProxy>);
+    void setDatabaseCallbacks(IDBDatabaseCallbacksProxy*);
 
 private:
     IDBCallbacksProxy(PassOwnPtr<WebIDBCallbacks>);
 
     OwnPtr<WebIDBCallbacks> m_callbacks;
-    RefPtr<IDBDatabaseCallbacksProxy> m_databaseCallbacks;
+    WebCore::Persistent<IDBDatabaseCallbacksProxy> m_databaseCallbacks;

[haraken, 2013/11/26 07:26:02]

Help me debug when you have time.

I'm hitting the following crash when creating an IDBCallbacksProxy object. This
looks strange because I already added  REQUIRE_THREADSAFE_HANDLES for
IDBDatabaseCallbacksProxy and IDBDatabaseCallbacks. Am I missing something?


crash log for DumpRenderTree (pid 17547):
STDOUT: <empty>
STDERR: ASSERTION FAILED: isAnyThreadInGC() || (m_thread == currentThread())
STDERR: ../../third_party/WebKit/Source/heap/ThreadState.h(200) : void
WebCore::ThreadState::checkThread() const
STDERR: 1   0x4496ae
STDERR: 2   0x4492e9
STDERR: 3   0x2b63abf
STDERR: 4   0x2b63325
STDERR: 5   0x2b626fc
STDERR: 6   0x2b62683
STDERR: 7   0x2b5ab41
STDERR: 8   0x1208f95
STDERR: 9   0x5418b3
STDERR: 10  0x1f1d24b
STDERR: 11  0x19d506e
STDERR: 12  0x19d4635
STDERR: 13  0x99fc31
STDERR: 14  0x99f803
STDERR: 15  0x998f5c
STDERR: 16  0x3dd9aa00616e
STDERR: Received signal 11 SEGV_MAPERR 0000bbadbeef
STDERR:  [0x000002def7de] base::debug::StackTrace::StackTrace()
STDERR:  [0x000002def317] base::debug::(anonymous
namespace)::StackDumpSignalHandler()
STDERR:  [0x7f30b0012cb0] <unknown>
STDERR:  [0x0000004496bd] WebCore::ThreadState::checkThread()
STDERR:  [0x0000004492e9] WebCore::PersistentBase<>::PersistentBase()
STDERR:  [0x000002b63abf] WebCore::Persistent<>::Persistent()
STDERR:  [0x000002b63325] WebCore::Persistent<>::Persistent()
STDERR:  [0x000002b626fc] WebKit::IDBCallbacksProxy::IDBCallbacksProxy()
STDERR:  [0x000002b62683] WebKit::IDBCallbacksProxy::create()
STDERR:  [0x000002b5ab41] WebKit::WebIDBFactoryImpl::deleteDatabase()
STDERR:  [0x000001208f95] TestWebIDBFactory::deleteDatabase()
STDERR:  [0x0000005418b3] WebKit::IDBFactoryBackendProxy::deleteDatabase()
STDERR:  [0x000001f1d24b] WebCore::IDBFactory::deleteDatabase()
STDERR:  [0x0000019d506e] WebCore::IDBFactoryV8Internal::deleteDatabaseMethod()
STDERR:  [0x0000019d4635]
WebCore::IDBFactoryV8Internal::deleteDatabaseMethodCallback()
STDERR:  [0x00000099fc31] v8::internal::HandleApiCallHelper<>()
STDERR:  [0x00000099f803] v8::internal::Builtin_Impl_HandleApiCall()
STDERR:  [0x000000998f5c] v8::internal::Builtin_HandleApiCall()
STDERR:  [0x3dd9aa00616e] <unknown>
STDERR:   r8: 00007f30a4ccc700  r9: 00007f30b511e0d0 r10: 0000000000000001 r11:
0000000000000000
STDERR:  r12: 0000000100000000 r13: 00000fe59b94b0b8 r14: 00000000041e2ace r15:
00007f30a4ccafd0
STDERR:   di: 0000000000000000  si: 00000000efcdab90  bp: 00007f30a4cca790  bx:
0000000000000008
STDERR:   dx: 00007f30ad9cfaa0  ax: 0000000000000010  cx: 00000000bbadbeef  sp:
00007f30a4cca770
STDERR:   ip: 00000000004496bd efl: 0000000000010246 cgf: 0000000000000033 erf:
0000000000000006
STDERR:  trp: 000000000000000e msk: 0000000000000000 cr2: 00000000bbadbeef

     bool m_didComplete;
     bool m_didCreateProxy;
 };