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

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

Issue 9380014: Merge 107174 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 10 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 | « Source/WebKit/chromium/src/DatabaseObserver.cpp ('k') | Source/WebKit/chromium/src/WebWorkerClientImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp
===================================================================
--- Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (revision 107408)
+++ Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (working copy)
@@ -183,7 +183,12 @@
}
WorkerLoaderProxy* workerLoaderProxy = &context->thread()->workerLoaderProxy();
WebWorkerBase* webWorker = static_cast<WebWorkerBase*>(workerLoaderProxy);
- WebFrame* webFrame = webWorker->view()->mainFrame();
+ WebView* webView = webWorker->view();
+ if (!webView) {
+ // Frame is closed, worker is terminaring.
+ return;
+ }
+ WebFrame* webFrame = webView->mainFrame();
m_webIDBFactory->open(name, new WebIDBCallbacksImpl(callbacks), origin, webFrame, dataDir);
#endif
}
« no previous file with comments | « Source/WebKit/chromium/src/DatabaseObserver.cpp ('k') | Source/WebKit/chromium/src/WebWorkerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698