Bug 35341 – Expose Database object of currently active task on the database thread

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

Expose Database object of currently active task on the database thread

Created attachment 49390 [details]
Patch

I can't think of any way to test this using a html file

[Jeremy Orlow]

Comment on attachment 49390 [details]
Patch

Close...but I think it's worth adding an assert.

> diff --git a/WebCore/storage/DatabaseThread.cpp b/WebCore/storage/DatabaseThread.cpp
> index ec4c6d1..e5a21d1 100644
> --- a/WebCore/storage/DatabaseThread.cpp
> +++ b/WebCore/storage/DatabaseThread.cpp
> @@ -42,6 +42,7 @@ namespace WebCore {
>  
>  DatabaseThread::DatabaseThread()
>      : m_threadID(0)
> +    , m_databaseOfCurrentTask(0)
>      , m_transactionClient(new SQLTransactionClient())
>      , m_transactionCoordinator(new SQLTransactionCoordinator())
>      , m_cleanupSync(0)
> @@ -96,7 +97,9 @@ void* DatabaseThread::databaseThread()
>  
>      AutodrainedPool pool;
>      while (OwnPtr<DatabaseTask> task = m_queue.waitForMessage()) {

ASSERT it's 0 first

> +        m_databaseOfCurrentTask = task->database();
>          task->performTask();
> +        m_databaseOfCurrentTask = 0;
>          pool.cycle();
>      }

Created attachment 49392 [details]
patch

[Jeremy Orlow]

Comment on attachment 49392 [details]
patch

r=me

[WebKit Commit Bot]

Comment on attachment 49392 [details]
patch

Clearing flags on attachment: 49392

Committed r55214: <http://trac.webkit.org/changeset/55214>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.