Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Unified Diff: Source/WebKit/chromium/src/WebWorkerClientImpl.cpp

Issue 10951014: Merge 128415 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698