Merge 95012 - [chromium] Remove AllowCrossThreadAccess for WorkerFileWriterCallbacksBridge.

Source/WebKit/chromium/src/WorkerFileWriterCallbacksBridge.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 44 matching lines @@
 {
     ASSERT(m_workerContext->isContextThread());
     m_clientOnWorkerThread = 0;
 }
 
 void WorkerFileWriterCallbacksBridge::postWriteToMainThread(long long position, const KURL& data)
 {
     ASSERT(!m_operationInProgress);
     m_operationInProgress = true;
     dispatchTaskToMainThread(createCallbackTask(&writeOnMainThread, 
-                                                AllowCrossThreadAccess(this), position, data));
+                                                this, position, data));
 }
 
 void WorkerFileWriterCallbacksBridge::postTruncateToMainThread(long long length)
 {
     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)
 {
     ASSERT(m_workerContext->isContextThread());
     m_clientOnWorkerThread = 0;
     dispatchTaskToMainThread(createCallbackTask(&shutdownOnMainThread, bridge));
 }
 
 void WorkerFileWriterCallbacksBridge::writeOnMainThread(ScriptExecutionContext*, PassRefPtr<WorkerFileWriterCallbacksBridge> bridge, long long position, const KURL& data)
@@ skipping 18 matching lines @@
 }
 
 void WorkerFileWriterCallbacksBridge::shutdownOnMainThread(ScriptExecutionContext*, PassRefPtr<WorkerFileWriterCallbacksBridge> bridge)
 {
     bridge->m_writerDeleted = true;
     bridge->m_writer.clear();
 }
 
 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";
 
 WorkerFileWriterCallbacksBridge::WorkerFileWriterCallbacksBridge(const KURL& path, WorkerLoaderProxy* proxy, ScriptExecutionContext* scriptExecutionContext, AsyncFileWriterClient* client)
     : WorkerContext::Observer(static_cast<WorkerContext*>(scriptExecutionContext))
     , m_proxy(proxy)
     , m_workerContext(scriptExecutionContext)
     , m_clientOnWorkerThread(client)
     , m_writerDeleted(false)
     , m_operationInProgress(false)
 {
     ASSERT(m_workerContext->isContextThread());
     m_mode = fileWriterOperationsMode;
     m_mode.append(String::number(static_cast<WorkerContext*>(scriptExecutionContext)->thread()->runLoop().createUniqueId()));
     postInitToMainThread(path);
 }
 
 void WorkerFileWriterCallbacksBridge::postInitToMainThread(const KURL& path)
 {
     dispatchTaskToMainThread(
-        createCallbackTask(&initOnMainThread, AllowCrossThreadAccess(this), path));
+        createCallbackTask(&initOnMainThread, this, path));
 }
 
 WorkerFileWriterCallbacksBridge::~WorkerFileWriterCallbacksBridge()
 {
     ASSERT(!m_clientOnWorkerThread);
     ASSERT(!m_writer);
 }
 
 // We know m_clientOnWorkerThread is still valid because it is only cleared on the context thread, and because we check in runTaskOnWorkerThread before calling any of these methods.
 void WorkerFileWriterCallbacksBridge::didWriteOnWorkerThread(ScriptExecutionContext*, PassRefPtr<WorkerFileWriterCallbacksBridge> bridge, long long length, bool complete)
@@ skipping 32 matching lines @@
 {
     ASSERT(bridge->m_workerContext->isContextThread());
     if (bridge->m_clientOnWorkerThread)
         taskToRun->performTask(scriptExecutionContext);
 }
 
 void WorkerFileWriterCallbacksBridge::dispatchTaskToMainThread(PassOwnPtr<ScriptExecutionContext::Task> task)
 {
     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()
 {
     while (m_operationInProgress) {
         WorkerContext* context = static_cast<WorkerContext*>(m_workerContext);
         if (context->thread()->runLoop().runInMode(context, m_mode) == MessageQueueTerminated)
             return false;
     }
     return true;
 }
 
 } // namespace WebKit
 
 #endif // ENABLE(FILE_SYSTEM)