Merge 128415

Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

Index: Source/WebKit/chromium/src/WebWorkerClientImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebWorkerClientImpl.cpp	(revision 128925)
+++ Source/WebKit/chromium/src/WebWorkerClientImpl.cpp	(working copy)
@@ -105,6 +105,7 @@
 
 void WebWorkerClientImpl::terminateWorkerContext()
 {
+    m_webFrame = 0;
     m_proxy->terminateWorkerContext();
 }
 
@@ -211,7 +212,7 @@
 void WebWorkerClientImpl::openFileSystem(WebFileSystem::Type type, long long size, bool create, 
                                          WebFileSystemCallbacks* callbacks)
 {
-    if (!m_webFrame->client()) {
+    if (m_proxy->askedToTerminate()) {
         callbacks->didFail(WebFileErrorAbort);
         return;
     }