From 03e12282df9aa1e1fb05a8b90f1cfc2e08764cec Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 9 Feb 2012 14:16:12 +0100 Subject: Imported WebKit commit e09a82039aa4273ab318b71122e92d8e5f233525 (http://svn.webkit.org/repository/webkit/trunk@107223) --- Source/WebKit/chromium/src/WebWorkerClientImpl.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/chromium/src/WebWorkerClientImpl.cpp') diff --git a/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp b/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp index 799599ab3..796ab166d 100644 --- a/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp +++ b/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp @@ -187,8 +187,10 @@ void WebWorkerClientImpl::workerContextDestroyed() 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 @@ void WebWorkerClientImpl::openFileSystem(WebFileSystem::Type type, long long siz 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 @@ bool WebWorkerClientImpl::allowDatabase(WebFrame*, const WebString& name, const } WebView* WebWorkerClientImpl::view() const -{ +{ + if (m_proxy->askedToTerminate()) + return 0; return m_webFrame->view(); } -- cgit v1.2.1