Merge 128415

Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

 /*
  * Copyright (C) 2009 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 87 matching lines @@
     RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(scriptURL, userAgent, settings, sourceCode, *this, *this, startMode,
                                                                          m_scriptExecutionContext->contentSecurityPolicy()->deprecatedHeader(),
                                                                          m_scriptExecutionContext->contentSecurityPolicy()->deprecatedHeaderType());
     m_proxy->workerThreadCreated(thread);
     thread->start();
     InspectorInstrumentation::didStartWorkerContext(m_scriptExecutionContext.get(), m_proxy, scriptURL);
 }
 
 void WebWorkerClientImpl::terminateWorkerContext()
 {
+    m_webFrame = 0;
     m_proxy->terminateWorkerContext();
 }
 
 void WebWorkerClientImpl::postMessageToWorkerContext(
     PassRefPtr<SerializedScriptValue> value, 
     PassOwnPtr<MessagePortChannelArray> ports)
 {
     m_proxy->postMessageToWorkerContext(value, ports);
 }
 
@@ skipping 86 matching lines @@
         return false;
     WebKit::WebViewImpl* webView = m_webFrame->viewImpl();
     if (!webView)
         return false;
     return !webView->permissionClient() || webView->permissionClient()->allowFileSystem(m_webFrame);
 }
 
 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;
     }
     m_webFrame->client()->openFileSystem(m_webFrame, type, size, create, callbacks);
 }
 
 bool WebWorkerClientImpl::allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize) 
 {
     if (m_proxy->askedToTerminate())
         return false;
@@ skipping 27 matching lines @@
 {
 }
 
 WebWorkerClientImpl::~WebWorkerClientImpl()
 {
 }
 
 } // namespace WebKit
 
 #endif