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

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

Issue 8317017: Merge 97546 - [Chromium] Some WebSQLDatabase in worker bug fixes. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 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/WebCore/storage/chromium/DatabaseTrackerChromium.cpp ('k') | 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 97635)
+++ Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (working copy)
@@ -188,6 +188,8 @@
bool WebWorkerClientImpl::allowFileSystem()
{
WebKit::WebViewImpl* webView = m_webFrame->viewImpl();
+ if (!webView)
+ return false;
return !webView->permissionClient() || webView->permissionClient()->allowFileSystem(m_webFrame);
}
@@ -199,8 +201,10 @@
bool WebWorkerClientImpl::allowDatabase(WebFrame*, const WebString& name, const WebString& displayName, unsigned long estimatedSize)
{
- WebKit::WebViewImpl* webView = m_webFrame->viewImpl();
- return !webView->permissionClient() || webView->permissionClient()->allowDatabase(m_webFrame, name, displayName, estimatedSize);
+ WebKit::WebViewImpl* webView = m_webFrame->viewImpl();
+ if (!webView)
+ return false;
+ return !webView->permissionClient() || webView->permissionClient()->allowDatabase(m_webFrame, name, displayName, estimatedSize);
}
void WebWorkerClientImpl::dispatchDevToolsMessage(const WebString& message)
« no previous file with comments | « Source/WebCore/storage/chromium/DatabaseTrackerChromium.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698