| Index: Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp
|
| ===================================================================
|
| --- Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp (revision 95463)
|
| +++ Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp (working copy)
|
| @@ -62,7 +62,7 @@
|
| ASSERT(!m_operationInProgress);
|
| m_operationInProgress = true;
|
| dispatchTaskToMainThread(createCallbackTask(&writeOnMainThread,
|
| - AllowCrossThreadAccess(this), position, data));
|
| + this, position, data));
|
| }
|
|
|
| void WorkerFileWriterCallbacksBridge::postTruncateToMainThread(long long length)
|
| @@ -70,13 +70,13 @@
|
| ASSERT(!m_operationInProgress);
|
| m_operationInProgress = true;
|
| dispatchTaskToMainThread(createCallbackTask(&truncateOnMainThread,
|
| - AllowCrossThreadAccess(this), length));
|
| + this, length));
|
| }
|
|
|
| void WorkerFileWriterCallbacksBridge::postAbortToMainThread()
|
| {
|
| ASSERT(m_operationInProgress);
|
| - dispatchTaskToMainThread(createCallbackTask(&abortOnMainThread, AllowCrossThreadAccess(this)));
|
| + dispatchTaskToMainThread(createCallbackTask(&abortOnMainThread, this));
|
| }
|
|
|
| void WorkerFileWriterCallbacksBridge::postShutdownToMainThread(PassRefPtr<WorkerFileWriterCallbacksBridge> bridge)
|
| @@ -115,17 +115,17 @@
|
|
|
| void WorkerFileWriterCallbacksBridge::didWrite(long long bytes, bool complete)
|
| {
|
| - dispatchTaskToWorkerThread(createCallbackTask(&didWriteOnWorkerThread, AllowCrossThreadAccess(this), bytes, complete));
|
| + dispatchTaskToWorkerThread(createCallbackTask(&didWriteOnWorkerThread, this, bytes, complete));
|
| }
|
|
|
| void WorkerFileWriterCallbacksBridge::didFail(WebFileError error)
|
| {
|
| - dispatchTaskToWorkerThread(createCallbackTask(&didFailOnWorkerThread, AllowCrossThreadAccess(this), error));
|
| + dispatchTaskToWorkerThread(createCallbackTask(&didFailOnWorkerThread, this, error));
|
| }
|
|
|
| void WorkerFileWriterCallbacksBridge::didTruncate()
|
| {
|
| - dispatchTaskToWorkerThread(createCallbackTask(&didTruncateOnWorkerThread, AllowCrossThreadAccess(this)));
|
| + dispatchTaskToWorkerThread(createCallbackTask(&didTruncateOnWorkerThread, this));
|
| }
|
|
|
| static const char fileWriterOperationsMode[] = "fileWriterOperationsMode";
|
| @@ -147,7 +147,7 @@
|
| void WorkerFileWriterCallbacksBridge::postInitToMainThread(const KURL& path)
|
| {
|
| dispatchTaskToMainThread(
|
| - createCallbackTask(&initOnMainThread, AllowCrossThreadAccess(this), path));
|
| + createCallbackTask(&initOnMainThread, this, path));
|
| }
|
|
|
| WorkerFileWriterCallbacksBridge::~WorkerFileWriterCallbacksBridge()
|
| @@ -200,14 +200,14 @@
|
| {
|
| ASSERT(m_workerContext->isContextThread());
|
| WebWorkerBase::dispatchTaskToMainThread(
|
| - createCallbackTask(&runTaskOnMainThread, AllowCrossThreadAccess(this), task));
|
| + createCallbackTask(&runTaskOnMainThread, this, task));
|
| }
|
|
|
| void WorkerFileWriterCallbacksBridge::dispatchTaskToWorkerThread(PassOwnPtr<ScriptExecutionContext::Task> task)
|
| {
|
| ASSERT(isMainThread());
|
| m_proxy->postTaskForModeToWorkerContext(
|
| - createCallbackTask(&runTaskOnWorkerThread, AllowCrossThreadAccess(this), task), m_mode);
|
| + createCallbackTask(&runTaskOnWorkerThread, this, task), m_mode);
|
| }
|
|
|
| bool WorkerFileWriterCallbacksBridge::waitForOperationToComplete()
|
|
|