Merge 107174

Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

Index: Source/WebKit/chromium/src/WebWorkerClientImpl.cpp
===================================================================
--- Source/WebKit/chromium/src/WebWorkerClientImpl.cpp	(revision 107406)
+++ Source/WebKit/chromium/src/WebWorkerClientImpl.cpp	(working copy)
@@ -187,8 +187,10 @@
     m_proxy->workerContextDestroyed();
 }
 
-bool WebWorkerClientImpl::allowFileSystem() 
+bool WebWorkerClientImpl::allowFileSystem()
 {
+    if (m_proxy->askedToTerminate())
+        return false;
     WebKit::WebViewImpl* webView = m_webFrame->viewImpl();
     if (!webView)
         return false;
@@ -203,6 +205,8 @@
 
 bool WebWorkerClientImpl::allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize) 
 {
+    if (m_proxy->askedToTerminate())
+        return false;
     WebKit::WebViewImpl* webView = m_webFrame->viewImpl();
     if (!webView)
         return false;
@@ -210,7 +214,9 @@
 }
  
 WebView* WebWorkerClientImpl::view() const 
-{   
+{
+    if (m_proxy->askedToTerminate())
+        return 0;
     return m_webFrame->view(); 
 }