Merge 121160

Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp

 /*
  * Copyright (C) 2010, 2012 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 169 matching lines @@
 
     cleanUpAfterCallback();
 }
 
 void WorkerFileSystemCallbacksBridge::cleanUpAfterCallback()
 {
     ASSERT(m_workerContext->isContextThread());
 
     m_callbacksOnWorkerThread = 0;
     if (m_workerContextObserver) {
-        delete m_workerContextObserver;
+        WorkerFileSystemContextObserver* observer = m_workerContextObserver;
         m_workerContextObserver = 0;
+        // The next line may delete this.
+        delete observer;
     }
 }
 
 void WorkerFileSystemCallbacksBridge::postOpenFileSystemToMainThread(WebCommonWorkerClient* commonClient, WebFileSystem::Type type, long long size, bool create, const String& mode)
 {
     dispatchTaskToMainThread(
         createCallbackTask(&openFileSystemOnMainThread,
                            AllowCrossThreadAccess(commonClient), type, size, create,
                            this, mode));
 }
@@ skipping 258 matching lines @@
     ASSERT(isMainThread());
 
     MutexLocker locker(m_loaderProxyMutex);
     if (m_workerLoaderProxy)
         m_workerLoaderProxy->postTaskForModeToWorkerContext(createCallbackTask(&runTaskOnWorkerThread, this, task), mode);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(FILE_SYSTEM)