Commit 72c7e0e8 authored by zerny@chromium.org's avatar zerny@chromium.org

Replace the Persistent in SQLiteDatabase with a member and trace it.

R=tkent@chromium.org
BUG=

Review URL: https://codereview.chromium.org/204543005

git-svn-id: svn://svn.chromium.org/blink/trunk@169944 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 288ffd0b
...@@ -250,6 +250,7 @@ DatabaseBackendBase::~DatabaseBackendBase() ...@@ -250,6 +250,7 @@ DatabaseBackendBase::~DatabaseBackendBase()
void DatabaseBackendBase::trace(Visitor* visitor) void DatabaseBackendBase::trace(Visitor* visitor)
{ {
visitor->trace(m_sqliteDatabase);
visitor->trace(m_databaseAuthorizer); visitor->trace(m_databaseAuthorizer);
} }
......
...@@ -421,4 +421,9 @@ bool SQLiteDatabase::turnOnIncrementalAutoVacuum() ...@@ -421,4 +421,9 @@ bool SQLiteDatabase::turnOnIncrementalAutoVacuum()
} }
} }
void SQLiteDatabase::trace(Visitor* visitor)
{
visitor->trace(m_authorizer);
}
} // namespace WebCore } // namespace WebCore
...@@ -53,6 +53,7 @@ extern const int SQLResultInterrupt; ...@@ -53,6 +53,7 @@ extern const int SQLResultInterrupt;
extern const int SQLResultConstraint; extern const int SQLResultConstraint;
class SQLiteDatabase { class SQLiteDatabase {
DISALLOW_ALLOCATION();
WTF_MAKE_NONCOPYABLE(SQLiteDatabase); WTF_MAKE_NONCOPYABLE(SQLiteDatabase);
friend class SQLiteTransaction; friend class SQLiteTransaction;
public: public:
...@@ -115,6 +116,8 @@ public: ...@@ -115,6 +116,8 @@ public:
enum AutoVacuumPragma { AutoVacuumNone = 0, AutoVacuumFull = 1, AutoVacuumIncremental = 2 }; enum AutoVacuumPragma { AutoVacuumNone = 0, AutoVacuumFull = 1, AutoVacuumIncremental = 2 };
bool turnOnIncrementalAutoVacuum(); bool turnOnIncrementalAutoVacuum();
void trace(Visitor*);
private: private:
static int authorizerFunction(void*, int, const char*, const char*, const char*, const char*); static int authorizerFunction(void*, int, const char*, const char*, const char*, const char*);
...@@ -129,7 +132,7 @@ private: ...@@ -129,7 +132,7 @@ private:
bool m_sharable; bool m_sharable;
Mutex m_authorizerLock; Mutex m_authorizerLock;
RefPtrWillBePersistent<DatabaseAuthorizer> m_authorizer; RefPtrWillBeMember<DatabaseAuthorizer> m_authorizer;
Mutex m_lockingMutex; Mutex m_lockingMutex;
ThreadIdentifier m_openingThread; ThreadIdentifier m_openingThread;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment