Merge 112576 - [Chromium] WorkerFileSystemContextObserver can reference a deleted WorkerFileSystemC…

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 128 matching lines @@
     }
 
     RefPtr<WorkerFileSystemCallbacksBridge> m_bridge;
     const String m_mode;
 };
 
 // Observes the worker context. By keeping this separate, it is easier to verify
 // that it only gets deleted on the worker context thread which is verified by ~Observer.
 class WorkerFileSystemContextObserver : public WebCore::WorkerContext::Observer {
 public:
-    static PassOwnPtr<WorkerFileSystemContextObserver> create(WorkerContext* context, WorkerFileSystemCallbacksBridge* bridge)
+    static PassOwnPtr<WorkerFileSystemContextObserver> create(WorkerContext* context, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge)
     {
         return adoptPtr(new WorkerFileSystemContextObserver(context, bridge));
     }
 
     // WorkerContext::Observer method.
     virtual void notifyStop()
     {
         m_bridge->stop();
     }
 
 private:
-    WorkerFileSystemContextObserver(WorkerContext* context, WorkerFileSystemCallbacksBridge* bridge)
+    WorkerFileSystemContextObserver(WorkerContext* context, PassRefPtr<WorkerFileSystemCallbacksBridge> bridge)
         : WebCore::WorkerContext::Observer(context)
         , m_bridge(bridge)
     {
     }
 
-    // Since WorkerFileSystemCallbacksBridge manages the lifetime of this class,
-    // m_bridge will be valid throughout its lifetime.
-    WorkerFileSystemCallbacksBridge* m_bridge;
+    RefPtr<WorkerFileSystemCallbacksBridge> m_bridge;
 };
 
 void WorkerFileSystemCallbacksBridge::stop()
 {
     ASSERT(m_workerContext->isContextThread());
     {
         MutexLocker locker(m_loaderProxyMutex);
         m_workerLoaderProxy = 0;
     }
 
@@ skipping 282 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)