Title: [128926] branches/chromium/1229/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp
- Revision
- 128926
- Author
- [email protected]
- Date
- 2012-09-18 13:35:21 -0700 (Tue, 18 Sep 2012)
Log Message
Merge 128415
BUG=147592
Review URL: https://codereview.chromium.org/10951014
Modified Paths
Diff
Modified: branches/chromium/1229/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (128925 => 128926)
--- branches/chromium/1229/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2012-09-18 20:34:26 UTC (rev 128925)
+++ branches/chromium/1229/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2012-09-18 20:35:21 UTC (rev 128926)
@@ -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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
